ares-ext 0.0.1 → 0.0.3

data/.gitignore

@@ -6,3 +6,4 @@ doc/*
 benchmarks/*
 .bundle
 vendor
+.yardoc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_resource_extensions (0.0.1)
+    ares-ext (0.0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -9,12 +9,20 @@ GEM
     activeresource (2.3.5)
       activesupport (= 2.3.5)
     activesupport (2.3.5)
+    addressable (2.2.8)
+    crack (0.3.1)
+    rcov (1.0.0)
     rspec (1.3.2)
+    webmock (1.7.6)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_resource_extensions!
   activeresource (= 2.3.5)
+  ares-ext!
+  rcov
   rspec (~> 1.3.1)
+  webmock (= 1.7.6)

data/Rakefile

@@ -13,4 +13,5 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts += ['--exclude', 'spec']
 end

data/active_resource_extensions.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.authors = ["Benoît Dinocourt"]
+  gem.authors = ["Benoit Dinocourt"]
   gem.email = ["ghrind@gmail.com"]
-  gem.description = "Make activeresource model compatible with will_paginate and searchlogic helpers, and add a schema feature"
+  gem.description = "Make activeresource models compatible with will_paginate and searchlogic helpers, and add a schema feature"
   gem.summary = gem.description
   gem.homepage = "http://github.com/Ghrind/active_resource_extensions"
 
@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.name = "ares-ext"
   gem.require_paths = ["lib"]
-  gem.version = '0.0.1'
+  gem.version = '0.0.3'
   
   #gem.extra_rdoc_files = [
   #  "LICENSE",
@@ -21,4 +21,6 @@ Gem::Specification.new do |gem|
   
   gem.add_development_dependency 'rspec', '~> 1.3.1'
   gem.add_development_dependency 'activeresource', '2.3.5'
+  gem.add_development_dependency 'rcov'
+  gem.add_development_dependency 'webmock', '1.7.6'
 end

data/lib/active_resource_extensions/resource_with_schema.rb

@@ -20,15 +20,15 @@ module ActiveResourceExtensions
       protected
 
       def schema
-        @schema ||= {}
+        @schema ||= remote_schema
       end
 
       def schema= new_schema
         @schema = new_schema
       end
 
-      def load_remote_schema
-        self.schema = get( :schema )
+      def remote_schema
+        get( :schema )
       end
 
     end
@@ -38,27 +38,27 @@ module ActiveResourceExtensions
         if self.class.is_attribute? name
           value = attributes[name.to_s]
           return if value.nil?
-          if self.class.is_attribute? name
-            case self.class.attribute_type name
-            when 'Time'
-              Time.parse value
-            when 'Integer'
-              value.to_i
-            when 'Float'
-              value.to_f
-            when 'Boolean'
-              [true, 1, '1'].include? value
-            when ''
-              value
-            else
-              begin
-                self.class.attribute_type( name ).constantize.new value
-              rescue ArgumentError, NameError
-                raise ArgumentError, "Can't cast #{value.inspect} into #{self.class.attribute_type( name )}"
-              end
-            end
+          case self.class.attribute_type name
+          when 'Time'
+            Time.parse value
+          when 'Date'
+            Date.parse value
+          when 'Integer'
+            value.to_i
+          when 'Float'
+            value.to_f
+          when 'Boolean'
+            [true, 1, '1'].include? value
+          when 'ObjectId'
+            value.to_s
+          when ''
+            value
           else
-            return value
+            begin
+              self.class.attribute_type( name ).constantize.new value
+            rescue ArgumentError, NameError
+              raise ArgumentError, "Can't cast #{value.inspect} into #{self.class.attribute_type( name )}"
+            end
           end
         else
           super name, *args, &block

data/lib/active_resource_extensions/searchable_resource/search.rb

@@ -9,9 +9,24 @@ module ActiveResourceExtensions
 
       attr_reader :conditions
 
-      def initialize model, conditions = {}
+      def initialize model, conditions = nil
         @model = model
-        @conditions = conditions
+        @conditions = conditions || {}
+      end
+
+      def order
+        @conditions[:order]
+      end
+
+      def order= new_order
+        @conditions[:order] = new_order
+      end
+
+      # Return all records matching conditions.
+      #
+      # @return [Array<ActiveResource::Base>] All records matching conditions.
+      def all
+        @model.find( :all, :params => parse_conditions( @conditions ) )
       end
 
       def paginate pagination_options = {}
@@ -38,18 +53,25 @@ module ActiveResourceExtensions
         params
       end
 
-      # If 
+      CONDITIONS_SUFFIXES = %w(
+        _greater_than
+        _less_than
+        _like
+      )
+
       def method_missing(name, *args, &block)
         name.to_s =~ /^([\w]*)(=?)$/
-        attr = $1.to_sym
+        condition_name = $1.to_sym
+        operator = $2
+        attribute_name = condition_name.to_s.sub(/(#{CONDITIONS_SUFFIXES.join('|')})$/, '').to_sym
 
         ignore_attribute = ! @model.respond_to?( :is_attribute? )
 
-        if ignore_attribute or @model.is_attribute?( attr )
-          if $2 == '='
-            @conditions[attr]= args.first
+        if ignore_attribute or @model.is_attribute?( attribute_name )
+          if operator == '='
+            @conditions[condition_name]= args.first
           else
-            @conditions[attr]
+            @conditions[condition_name]
           end
         else
           super name, *args, &block

data/spec/active_resource_extensions/resource_with_schema_spec.rb

@@ -19,8 +19,22 @@ describe ActiveResourceExtensions::ResourceWithSchema do
     Person.respond_to?( :schema ).should be_true
   end
 
-  it "should have an empty schema" do
-    Person.send( :schema ).should == {}
+  it "should not have a schema" do
+    Person.instance_variable_get( :@schema ).should be_nil
+  end
+
+  describe '::schema' do
+    it "should load remote schema" do
+      schema = { 'name' => 'String', 'age' => 'Integer' }
+      Person.should_receive( :get ).with( :schema ).and_return( schema )
+      Person.send( :schema ).should == schema
+    end
+    it "should memoize schema" do
+      schema = { 'name' => 'String', 'age' => 'Integer' }
+      Person.should_receive( :get ).with( :schema ).once.and_return( schema )
+      Person.send( :schema ).should == schema
+      Person.send( :schema ).should == schema
+    end
   end
 
   it "should replace schema" do
@@ -29,17 +43,11 @@ describe ActiveResourceExtensions::ResourceWithSchema do
     Person.send( :schema ).should == schema
   end
 
-  describe '::load_remote_schema' do
+  describe '::remote_schema' do
     it "should use active_resource get method" do
-      Person.should_receive( :get ).with( :schema )
-      Person.send :load_remote_schema
-    end
-
-    it "should load schema from response" do
       schema = { 'name' => 'String', 'age' => 'Integer' }
       Person.should_receive( :get ).with( :schema ).and_return( schema )
-      Person.send :load_remote_schema
-      Person.send( :schema ).should == schema
+      Person.send( :remote_schema ).should == schema
     end
   end
 
@@ -88,10 +96,12 @@ describe ActiveResourceExtensions::ResourceWithSchema do
         'name'        => 'String',
         'age'         => 'Integer',
         'created_at'  => 'Time',
+        'birth_date'  => 'Date',
         'is_musician' => 'Boolean',
         'height'      => 'Float',
         'unknown_1'   => 'Company',
-        'unknown_2'   => ''
+        'unknown_2'   => '',
+        'company_id'  => 'ObjectId'
       } )
     end
 
@@ -127,10 +137,12 @@ describe ActiveResourceExtensions::ResourceWithSchema do
           @person = Person.new(
             :name        => 'John',
             :age         => '26',
+            :birth_date  => '1983-07-24',
             :height      => '5.3',
             :is_musician => '1',
             :created_at  => '2012-05-01 23:15:12',
             :unknown_1   => 'a',
+            :company_id  => '4fr654r321',
             :unknown_2   => 'b' )
         end
 
@@ -140,6 +152,8 @@ describe ActiveResourceExtensions::ResourceWithSchema do
           @person.height.should == 5.3
           @person.is_musician.should == true
           @person.created_at.should == Time.parse('2012-05-01 23:15:12')
+          @person.birth_date.should == Date.parse('1983-07-24')
+          @person.company_id.should == '4fr654r321'
 
           for value in [ '0', 0, false, 'true' ]
             person = Person.new( :is_musician => value )

data/spec/active_resource_extensions/searchable_resource_spec/collection_spec.rb

@@ -6,6 +6,17 @@ describe ActiveResourceExtensions::SearchableResource::Collection do
     @collection = ActiveResourceExtensions::SearchableResource::Collection.new [], 2, 10, 51
   end
 
+  describe '.method_missing' do
+    it "should proxy every missing method to target" do
+      target = []
+      @collection = ActiveResourceExtensions::SearchableResource::Collection.new target, 2, 10, 51
+      for method_name in %w( class << [] ) do
+        target.should_receive( method_name.intern ).and_return nil
+        @collection.send method_name.intern
+      end
+    end
+  end
+
   describe '.total_pages' do
     it "should return correct page number" do
       @collection.total_pages.should == 6

data/spec/active_resource_extensions/searchable_resource_spec/search_spec.rb

@@ -16,7 +16,39 @@ describe ActiveResourceExtensions::SearchableResource::Search do
     end
   end
 
-  describe '.method_missing' do
+  describe '.new' do
+    it "should never set conditions to nil" do
+      search = ActiveResourceExtensions::SearchableResource::Search.new Person
+      search.conditions.should_not be_nil
+
+      search = ActiveResourceExtensions::SearchableResource::Search.new Person, nil
+      search.conditions.should_not be_nil
+    end
+  end
+
+  describe '#order' do
+
+    context "when class has a schema" do
+
+      before do
+        Person.send :include, ActiveResourceExtensions::ResourceWithSchema
+        Person.send :schema=, 'name' => 'String', 'age' => 'Integer'
+        @search = Person.search_for
+      end
+
+      it "should set :order condition" do
+        @search.order = 'name'
+        @search.conditions[:order].should == 'name'
+      end
+
+      it "should return :order condition" do
+        @search.instance_variable_set :@conditions, { :order => 'name' }
+        @search.order.should == 'name'
+      end
+    end
+  end
+
+  describe '#method_missing' do
     context "when class has a schema" do
 
       before do
@@ -39,6 +71,36 @@ describe ActiveResourceExtensions::SearchableResource::Search do
 
       end
 
+      context "when method name is a known attribute with a valid suffix" do
+
+        it "should set condition" do
+          for suffix in %w( _like _greater_than _less_than )
+            @search.send :"age#{suffix}=", 26
+            @search.conditions[:"age#{suffix}"].should == 26
+          end
+        end
+
+        it "should get condition" do
+          for suffix in %w( _like _greater_than _less_than )
+            @search.instance_variable_set :@conditions, :"age#{suffix}" => 26
+            @search.send( :"age#{suffix}" ).should == 26
+          end
+        end
+
+      end
+
+      context "when method name is a known attribute with a valid suffix" do
+        it "should have default behavior" do
+          lambda do
+            @search.name_looks_like
+          end.should raise_error NoMethodError
+
+          lambda do
+            @search.name_looks_like= 'bob'
+          end.should raise_error NoMethodError
+        end
+      end
+
       context "when method name is not an attribute" do
         it "should have default behavior" do
           lambda do
@@ -63,13 +125,34 @@ describe ActiveResourceExtensions::SearchableResource::Search do
     end
   end
 
-  describe '.parse_conditions' do
+  describe '#parse_conditions' do
     it "should remove empty conditions" do
       @search.send( :parse_conditions, :name_like => 'john', :age => '' ).should == { :name_like => 'john' }
     end
   end
 
-  describe '.paginate' do
+  describe '#all' do
+    it "should parse conditions" do
+      @search.name_like = 'john'
+      @search.age = ''
+
+      @search.should_receive( :parse_conditions ).with( :name_like => 'john', :age => '' ).and_return :name_like => 'john'
+
+      Person.should_receive( :find ).with( :all, :params => { :name_like => 'john' } ).and_return []
+
+      @search.all
+    end
+
+    it "should return an Array" do
+
+      @people = (1..2).map{ |i| Person.new :id => i }
+
+      Person.should_receive( :find ).with( :all, :params => { } ).and_return @people
+      @search.all.should == @people
+    end
+  end
+
+  describe '#paginate' do
 
     it "should parse conditions" do
       @search.name_like = 'john'

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: ares-ext
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
-- "Beno\xC3\xAEt Dinocourt"
+- Benoit Dinocourt
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 +02:00
+date: 2012-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,37 @@ dependencies:
         version: 2.3.5
   type: :development
   version_requirements: *id002
-description: Make activeresource model compatible with will_paginate and searchlogic helpers, and add a schema feature
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 7
+        - 6
+        version: 1.7.6
+  type: :development
+  version_requirements: *id004
+description: Make activeresource models compatible with will_paginate and searchlogic helpers, and add a schema feature
 email: 
 - ghrind@gmail.com
 executables: []
@@ -109,7 +139,7 @@ rubyforge_project:
 rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: Make activeresource model compatible with will_paginate and searchlogic helpers, and add a schema feature
+summary: Make activeresource models compatible with will_paginate and searchlogic helpers, and add a schema feature
 test_files: 
 - spec/active_resource_extensions/resource_with_schema_spec.rb
 - spec/active_resource_extensions/searchable_resource_spec.rb