dm-persevere-adapter 0.40.0 → 0.41.0

data/VERSION

@@ -1 +1 @@
-0.40.0
+0.41.0

data/lib/model_json_support.rb

@@ -23,8 +23,8 @@ module DataMapper
       tm = repository(repo).adapter.type_map
       json_hash = { "type" => tm[type][:primitive] }
       json_hash.merge!( tm[type].reject{ |key,value| key == :primitive } )
-      json_hash.merge!({ "optional" => true }) unless required? == true
-      json_hash.merge!({ "unique"  => true})   if     unique? == true
+      json_hash.merge!({ "optional" => true }) unless required?
+      json_hash.merge!({ "unique"  => true})   if     unique?
       json_hash.merge!({"position" => @position }) unless @position.nil?
       # MIN
       # MAX

data/lib/persevere_adapter.rb

@@ -360,7 +360,7 @@ module DataMapper
         
         tblname = query.model.storage_name
         path = "/#{tblname}/#{json_query}"
-        puts path
+        # puts path
         response = @persevere.retrieve(path, headers)
 
         if response.code.match(/20?/)
@@ -369,7 +369,11 @@ module DataMapper
             # Typecast attributes, DM expects them properly cast
             query.model.properties.each do |prop|
               value = rsrc_hash[prop.field.to_s]
-              rsrc_hash[prop.field.to_s] = prop.typecast(value) unless value.nil?
+              if prop.field == 'id'
+                rsrc_hash[prop.field.to_s]  = value.to_s.match(/\d+$/)[0].to_i
+              else
+                rsrc_hash[prop.field.to_s] = prop.typecast(value) unless value.nil?
+              end
               # Shift date/time objects to the correct timezone because persevere is UTC
               case prop 
                 when DateTime then rsrc_hash[prop.field.to_s] = value.new_offset(Rational(Time.now.getlocal.gmt_offset/3600, 24))
@@ -380,7 +384,16 @@ module DataMapper
           resources = query.model.load(results, query)
         end
         # We could almost elimate this if regexp was working in persevere.
-        query.match_records(resources)
+
+        # This won't work if the RegExp is nested more then 1 layer deep.
+        if query.conditions.class == DataMapper::Query::Conditions::AndOperation
+           regexp_conds = query.conditions.operands.select{ |obj| obj.is_a?(DataMapper::Query::Conditions::RegexpComparison) || 
+             (obj.is_a?(DataMapper::Query::Conditions::NotOperation) && obj.operand.is_a?(DataMapper::Query::Conditions::RegexpComparison))}
+           regexp_conds.each{|cond| resources = resources.select{|resource| cond.matches?(resource)} }
+         
+         end
+        # query.match_records(resources)
+        resources
       end
 
       alias :read :read_many
@@ -638,9 +651,10 @@ module DataMapper
             when DataMapper::Query::Conditions::InclusionComparison then process_in(condition.subject.name, condition.value)
             when DataMapper::Query::Conditions::EqualToComparison then
               cond = condition.loaded_value
-              cond = 'undefined' if cond.nil?
+
               cond = "\"#{cond}\"" if cond.is_a?(String)
               cond = "date(%10.f)" % (Time.parse(cond.to_s).to_f * 1000) if cond.is_a?(DateTime)
+              cond = 'undefined' if cond.nil?
               "#{condition.subject.name.to_s}=#{cond}"
             when DataMapper::Query::Conditions::NullOperation then []
             when Array then
@@ -656,6 +670,7 @@ module DataMapper
         query_terms = Array.new
         order_operations = Array.new
         field_ops = Array.new
+        fields = Array.new
         headers = Hash.new
 
         query_terms << process_condition(query.conditions) 
@@ -690,6 +705,8 @@ module DataMapper
             when :avg
               "[=#{field.target.name}]"
           end
+        else
+          fields << "#{field.name}:#{field.name}"
         end
         end
            
@@ -706,6 +723,8 @@ module DataMapper
 
         json_query += order_operations.join("")
 
+        json_query += "[={" + fields.join(',') + "}]" unless fields.empty?
+
         offset = query.offset.to_i
         limit = query.limit.nil? ? nil : query.limit.to_i + offset - 1
         

data/spec/persevere_adapter_spec.rb

@@ -17,8 +17,7 @@ describe DataMapper::Adapters::PersevereAdapter do
     class ::Bozon
       include DataMapper::Resource
 
-      # Persevere only does id's as strings.  
-      property :id, String, :serial => true
+      property :id, Serial
       property :author, String
       property :created_at, DateTime
       property :title, String
@@ -26,9 +25,7 @@ describe DataMapper::Adapters::PersevereAdapter do
 
     class ::Dataino
       include DataMapper::Resource
-
-      # Persevere only does id's as strings.  
-      property :id, String, :serial => true
+      property :id, Serial
       property :author, String
       property :created_at, DateTime
       property :title, String
@@ -192,7 +189,7 @@ describe DataMapper::Adapters::PersevereAdapter do
     it "should return data from an offset" do
       result = Bozon.all(:limit => 5, :offset => 10)
       result.length.should == 5
-      result.map { |item| item.id }.should == ["11", "12", "13", "14", "15"]
+      result.map { |item| item.id }.should == [11, 12, 13, 14, 15]
     end
 
     after(:all) do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 40
+  - 41
   - 0
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -07:00
+date: 2010-03-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency