active_repository 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODc4ODk0M2JiZTk5ZGE4ODZiYzM4OGRmNzNiZmYxODVlZjk1Yzg2Yg==
+    MjliYTU5ODNhMzMyZThjNWI4MGRjYmJkMTI2ZmRmYzgyOTFkZGQ4OA==
   data.tar.gz: !binary |-
-    NDM4YjY5YjIyY2JhZTUxOWVjNzdkY2ZkYWFkMWYzZmI3YjQ2NzNkMQ==
+    NWJjYzEwNmVjN2NlYjVkNTM0ZTI1NjczYTZhOTA2MGU2Y2JhMjc1YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWRmMTRiYzEwMjMwMjE2ZDg0YzJiZWE1MzEzZWI5MDViY2Q2ZDdjMDEyY2Rj
-    MjVmNTI0MWYwODNhNzM2NzkzMzIzZTZiYzllYjg2ODA5NDgyMjM0OTgxNTQx
-    N2U0NDI0MGRkZTk5OTNiOGZmYzYwNjY2MGNmMDhmZmY2MWI2YjQ=
+    NWFlMDExYTJmOGFmYzY1NzAxZmFjMDJiZDIwYmI5ZWNhMzhjMjI2NzkwM2Ey
+    NmVmODhlMzljMzAzYmU4YmJjNzZhNzAzYmVjOWZlMzhmYmIyNmZmOTk0NGNl
+    OTE2NDQxOGUzMzY4ZjM5MjZiYWM0MDEyMjk3ZmIwYTg5MmJjNDQ=
   data.tar.gz: !binary |-
-    YjYzN2E1ZTdlOTI2ODMxYWVlZjlkYmM3NzgwNGRmZWQ0ODJlNDA0NjgyNmFj
-    ZTM5MjRiODkzZTJmMWNhMmMzNjRiZjFkNjhjMmJkZDZlMDMxNDJhODQ5NThk
-    OWI1N2RhNWM5ODA1NzU2ODhlMGQ2YzdmMWM5MTM5YjJlMmJlYmI=
+    YWZkYTZjMGU2ODQ4OGNhNWJjMGZlMTY0ZWJkYTY0YTk0Y2EwNjFjN2JhOTFm
+    ODI3NzdjNDliMmQ4N2NkZjVhZmExNzU4ODdlNTEwZTNmYTdmZmVlZDk2MTY2
+    ZTIyNDNmNjVlMjQzMjliNjE4NzJlZWIyOTYwZmJkODRjOGUxNWQ=

data/lib/active_repository/adapters/default_adapter.rb

@@ -45,6 +45,7 @@ class DefaultAdapter
     end
 
     def where(klass, args)
+      # raise args.inspect
       klass.get_model_class.where(args)
     end
   end

data/lib/active_repository/base.rb

@@ -150,7 +150,7 @@ module ActiveRepository
         super(query)
       else
         objects = []
-        args = args.first.is_a?(Hash) ? args.first : args
+        args = args.first.is_a?(Hash) ? args.first : (args.first.is_a?(Array) ? args.first : args)
 
         PersistenceAdapter.where(self, args).each do |object|
           objects << self.serialize!(object.attributes)

data/lib/active_repository/sql_query_executor.rb

@@ -7,7 +7,7 @@ module ActiveHash #:nodoc:
         return args.first if args.size == 1
 
         query = args.first
-        param = args.delete(args[1])
+        param = args.delete_at(1)
 
         param = convert_param(param)
 
@@ -24,7 +24,7 @@ module ActiveHash #:nodoc:
         @operator.nil? ? @objects : @objects.send(@operator, execute(klass, @sub_query)).sort_by{ |o| o.id }
       end
 
-      private
+    private
       # Splits the first sub query from the rest of the query and returns it.
       def divide_query
         array = @query.split(" ")
@@ -87,7 +87,7 @@ module ActiveHash #:nodoc:
       # Executes the #sub_quey defined operator filter
       def execute_operator(klass, sub_query)
         klass.all.select do |o|
-          field, attribute = convert_attrs(o.send(sub_query.first), sub_query[2])
+          field, attribute = convert_attrs(o.send(sub_query.first.gsub(/[\(\)]/, "")), sub_query[2])
 
           field.blank? ? false : field.send(@operator, attribute)
         end

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/active_repository/writers.rb

@@ -3,6 +3,7 @@ module ActiveRepository
   module Writers
     # Creates an object and persists it.
     def create(attributes={})
+      attributes = attributes.symbolize_keys if attributes.respond_to?(:symbolize_keys)
       object = self.new(attributes)
 
       if object.present? && object.valid?

data/spec/support/sql_query_shared_examples.rb

@@ -306,6 +306,13 @@ shared_examples "and" do
     records.first.id.should == 2
     records.should == [Country.find(2), Country.find(4)]
   end
+
+  it "integer attribute and condition" do
+    records = Country.where("id = 2 and language = 'English'")
+    records.count.should == 2
+    records.first.id.should == 2
+    records.should == [Country.find(2), Country.find(4)]
+  end
 end
 
 shared_examples "or" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash