dm-persevere-adapter 0.41.0 → 0.42.0

data/VERSION

@@ -1 +1 @@
-0.41.0
+0.42.0

data/lib/persevere_adapter.rb

@@ -387,11 +387,11 @@ module DataMapper
 
         # 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) || 
+          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)} }
+          regexp_conds.each{|cond| resources = resources.select{|resource| cond.matches?(resource)} }
          
-         end
+        end
         # query.match_records(resources)
         resources
       end
@@ -706,7 +706,11 @@ module DataMapper
               "[=#{field.target.name}]"
           end
         else
-          fields << "#{field.name}:#{field.name}"
+          if field.name.to_s.match(/\d/) != nil
+            fields << "'#{field.name}':'#{field.name}'"
+          else
+            fields << "#{field.name}:#{field.name}"
+          end
         end
         end
            

data/spec/persevere_adapter_spec.rb

@@ -38,6 +38,15 @@ describe DataMapper::Adapters::PersevereAdapter do
       property :name, String
     end
     
+    class ::Mukatron
+      include DataMapper::Resource
+      
+      property :id, Serial
+      property :street1, String
+      property :b8te, String
+      property :name, String
+    end
+    
     @test_schema_hash = {
       'id' => 'Vanilla',
       'properties' => {
@@ -221,6 +230,7 @@ describe DataMapper::Adapters::PersevereAdapter do
   describe 'finding models' do
     before(:each) do
       Bozon.auto_migrate!
+      Mukatron.auto_migrate!
     end
     
     it "should find simple strings" do
@@ -243,8 +253,30 @@ describe DataMapper::Adapters::PersevereAdapter do
       Bozon.all(:created_at => time).length.should eql(1)
     end
     
+    it "should be able to pull one field" do
+      Bozon.create(:title => 'Story')
+      Bozon.create(:title => 'Tail')
+      Bozon.all(:fields => [:title]).length.should == 2
+    end
+    
+    it "should retrieve properties that end in a number" do
+      Mukatron.create(:street1 => "11th", :b8te => 'true', :name => 'Porky')
+      Mukatron.create(:street1 => "12th", :b8te => 'false', :name => 'Porky')
+      Mukatron.all.length.should == 2
+      Mukatron.all(:fields => [:id,:street1]).length.should == 2
+    end
+    require 'ruby-debug'
+    it "should retrieve properties that have a number in the middle" do
+      Mukatron.create(:street1 => "11th", :b8te => 'true', :name => 'Porky')
+      Mukatron.create(:street1 => "12th", :b8te => 'false', :name => 'Porky')
+      # /mukatron/[/id][={'b8te':'b8te'}]
+      debugger
+      Mukatron.all(:fields => [:b8te]).length.should == 2
+    end
+    
     after(:all) do
       Bozon.auto_migrate_down!
+      Mukatron.auto_migrate_down!
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 41
+  - 42
   - 0
-  version: 0.41.0
+  version: 0.42.0
 platform: ruby
 authors: 
 - Ivan R. Judson