arspy 0.0.4 → 0.0.5

data/.gitignore

@@ -3,3 +3,5 @@ pkg
 nbproject
 arspy*.gem
 arspy*.gemspec
+TODO.txt
+

data/Rakefile

@@ -11,6 +11,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.7'
   s.description = 'Active Record Spy'
   s.summary = 'Rails console command line tool for browsing and inspecting the structure, associations and data of an ActiveRecord data model.'
+
+  s.add_dependency('awesome_print', '>= 0.1.1')
   
   exclude_folders = '' # 'spec/rails/{doc,lib,log,nbproject,tmp,vendor,test}'
   exclude_files = [] # FileList['**/*.log'] + FileList[exclude_folders+'/**/*'] + FileList[exclude_folders]

data/lib/arspy/class_extensions.rb

@@ -4,6 +4,8 @@ module Arspy
       module Base
         def la; Arspy::Operators.list_associations(self); end
         def lf; Arspy::Operators.list_fields(self); end
+        def pr; Arspy::Operators.awesome_print(self); end
+        def ap(opts={}); Arspy::Operators.awesome_print(self, opts); end
       end
     end
   end

data/lib/arspy/delegators/active_record_extensions.rb

@@ -1,9 +1,10 @@
 module Arspy
   module Delegators
     module ActiveRecordExtensions
-      def pr(*args); Arspy::Operators.print_object(self, *args); end
       def la; Arspy::Operators.list_associations(self.class); end
       def lf; Arspy::Operators.list_fields(self.class); end
+      def pr(*args); Arspy::Operators.print_object(self, *args); end
+      def ap(opts={}); Arspy::Operators.awesome_print(self, opts); end
     end
   end
 end

data/lib/arspy/delegators/array_extensions.rb

@@ -14,10 +14,13 @@ module Arspy
       end
 
       def la
-        Arspy::Operators.list_associations(self.first.class) unless (self.emtpy? || !(self.first.is_a?(ActiveRecord::Base)))
+        Arspy::Operators.list_associations(self.first) unless self.emtpy?
       end
       def lf
-        Arspy::Operators.list_fields(self.first.class) unless (self.empty? || !(self.first.is_a?(ActiveRecord::Base)))
+        Arspy::Operators.list_fields(self.first) unless self.empty?
+      end
+      def ap(opts={})
+        Arspy::Operators.awesome_print(self, opts={}) unless self.empty?
       end
       def pr(*args)
         Arspy::Operators.print_array(self, *args)

data/lib/arspy/delegators/association_collection_extensions.rb

@@ -9,17 +9,21 @@ module Arspy
           result
         end
       end
-      def pr(*args)
-        load_target unless loaded?
-        Arspy::Operators.print_array(@target, *args)
-      end
       def la
         load_target unless loaded?
-        Arspy::Operators.list_associations(@target.first.class) unless (@target.emtpy? || !(@target.first.is_a?(ActiveRecord::Base)))
+        Arspy::Operators.list_associations(@target.first) unless @target.emtpy?
       end
       def lf
         load_target unless loaded?
-        Arspy::Operators.list_fields(@target.first.class) unless (@target.empty? || !(@target.first.is_a?(ActiveRecord::Base)))
+        Arspy::Operators.list_fields(@target.first) unless @target.empty?
+      end
+      def pr(*args)
+        load_target unless loaded?
+        Arspy::Operators.print_array(@target, *args)
+      end
+      def ap(opts={})
+        load_target unless loaded?
+        Arspy::Operators.awesome_print(@target, opts) unless @target.empty?
       end
       def wi(*args)
         load_target unless loaded?

data/lib/arspy/delegators/null_extensions.rb

@@ -4,6 +4,7 @@ module Arspy
       def la; end
       def lf; end
       def pr(*args); end
+      def ap(opts={}); end
     end
   end
 end

data/lib/arspy/operators.rb

@@ -1,6 +1,9 @@
 module Arspy
   module Operators
-    def self.list_associations(active_record_klass)
+
+    def self.list_associations(klass_or_object)
+      active_record_klass = klass_or_object.is_a?(Class) ? klass_or_object : klass_or_object.class
+      return unless active_record_klass.ancestors.include?(ActiveRecord::Base)
       counts = {}
       rows = active_record_klass.reflect_on_all_associations.map do |assoc|
         counts[assoc.macro] ||= 0
@@ -12,7 +15,9 @@ module Arspy
       "Total: #{counts.inject(0){|sum, count| sum+count.last}} (" + counts.map{|count| "#{count.last} #{count.first}" }.join(', ') + ")"
     end
 
-    def self.list_fields(active_record_klass)
+    def self.list_fields(klass_or_object)
+      active_record_klass = klass_or_object.is_a?(Class) ? klass_or_object : klass_or_object.class
+      return unless active_record_klass.ancestors.include?(ActiveRecord::Base)
       rows = active_record_klass.columns.map do |column|
         self.format_column_field(column)
       end
@@ -21,6 +26,11 @@ module Arspy
       "Total #{active_record_klass.columns.size} field#{active_record_klass.columns.size == 1 ? '' : 's'}"
     end
 
+    def self.awesome_print(klass_object_or_array, options={})
+      AwesomePrint.new(options).puts klass_object_or_array
+      nil
+    end
+
     def self.format_column_association(assoc)
       select_options = assoc.options.select{|k,v| [:through, :as, :polymorphic].include?(k)}
       [assoc.name.to_s, assoc.macro.to_s, "(#{assoc.options[:class_name] || assoc.name.to_s.singularize.camelize})", select_options.empty? ? '' : Hash[*select_options.flatten].inspect]
@@ -30,7 +40,14 @@ module Arspy
     end
 
     def self.print_array(array, *args)
-      array.each{|element| puts element.is_a?(String) ? element : element.inspect } if args.empty?
+      if args.empty?
+        case array.first
+        when ActiveRecord::Base then AwesomePrint.new.puts(array)
+        else
+          array.each{|element| puts element}
+        end
+      end
+      #array.each{|element| puts element.is_a?(String) ? element : element.inspect } if args.empty?
       self.print_matrix(
         array.map do |obj|
           args.map do |arg|
@@ -46,8 +63,8 @@ module Arspy
     end
 
     def self.print_object(object, *args)
-      print_matrix([args.map{|arg| object[arg]}]) if args
-      puts(object.inspect) unless args
+      print_matrix([args.map{|arg| object[arg]}]) unless args.empty?
+      AwesomePrint.new.puts(object) if args.empty?
       nil
     end
     def self.test_object(obj, args)
@@ -127,7 +144,7 @@ module Arspy
           list[desc[:abbr]] = desc
         end
       end
-      descriptors.reject!{|desc| ambiguities.map{|h| h.first}.include?(desc[:abbr])}
+      descriptors.reject!{|desc| ambiguities.map{|hash| hash.first}.include?(desc[:abbr])}
       ambiguities
     end
     def self.abbreviate_method_name(method_name)

data/lib/arspy.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 raise 'Arspy only runs in an ActiveRecord environment' unless defined?(ActiveRecord::Base)
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__))
 
@@ -6,6 +7,8 @@ require 'meta_programming'
 require 'arspy/operators'
 require 'arspy/delegators'
 require 'arspy/class_extensions'
+gem 'awesome_print', ">= 0.1.1"
+require 'ap'
 
 module Arspy
   def self.included(base)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jeff Patmon
@@ -14,10 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 -07:00
+date: 2010-04-05 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: awesome_print
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  type: :runtime
+  version_requirements: *id001
 description: Active Record Spy
 email: jpatmon@gmail.com
 executables: []