crud-service 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzc4NzcyMDZkZjYyNmY1NDcwMjVmMDI2NWVhMGEwN2ZiN2QyOGViZA==
+    OWU4YWI0ZDc4OWRiYTU2YjhjYjg5MzFjNWM2MDg2MjJhZjQwYzU4YQ==
   data.tar.gz: !binary |-
-    YTk5OTkyYzY3YmQ5MmEzYTc3YmZhN2VjM2JiM2Q1MGEzYjRhMDBjYg==
+    NDFkMmFkZmZmODQ3YjVhNzA3Y2M4MzgwMjgzYzg2NGU1MzAxYTM4YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2RmY2NjNGU2MDMwNjZlNzA3ODhjZjlhN2MxMmNlMmI5MjQ3ZmU4ODdlZmVm
-    ZTRjN2Q2MTJkNWU0YmVlNjVmY2I4M2Y0NGUxOTIwODJkNGEzODg1NzBhOWQy
-    ZWI0OWEyYjU5ZTFkNDZiNzlkN2M0ZjkxZWEyYzUzNjI2MzExZWE=
+    YTI3MDU2ZmU4MTc1ZDU2MWM3NmM1MGFiYTIwMDYzYWEzNWY3MGQ1MzY3YjBh
+    Y2Q5NWEyYjczZmIzZmMzZGY0Mjg5MGEzMTViOWE4NGRiODc1NThjZjA5NGE0
+    MzcyZmQxMmIxZDE2ZmZhMGY3OGY1NzU4ZjE0ZDczMTE4NGQ4ZWQ=
   data.tar.gz: !binary |-
-    OGZiNGMyZmE0MDYxNWU3MDhjYTYyNmFmNTgyNjYwZTU1Y2RiODY3NGEyZTRi
-    YjYzMGY1YTM5MjZmOTZhNWNhNjNlMDkwYmUyYTliZTAyZGRlZjBjYTJkMzEz
-    MDk2MzZiM2YxMDk1ZTMyMDQyNDQwYjJlMmI2OWYzY2Q2MTkzYzk=
+    YTQzOGZlMjM2MDkxODAzZDU0ZmMyZDM1MzQ2Njc0ZTM2MTg1MmQ4ZmI4MTAw
+    NzVmZTkzNDJmMTRlNjBlNDQ2YmQ1MTY1YzE0MmI1MzljZTZhZjE4ZWJkODky
+    N2I0MjIwMWE0M2IwZjA2YjMxMmU2NzRhODhjNWM3MWY3ZDZiNjI=

data/lib/api.rb

@@ -39,7 +39,7 @@ module CrudService
             return 400 unless service.valid_insert?(data)
 
             # Already Exists?
-            return 409 if service.exists_by_primary_key?(data['code'])
+            return 409 if service.exists_by_primary_key?(data[primary_key_name])
 
             # Do Insert
             record = service.insert(data)
@@ -57,7 +57,7 @@ module CrudService
             service = settings.send(service_name)
 
             # Must Exist
-            return 404 unless service.exists_by_primary_key?(params[:code])
+            return 404 unless service.exists_by_primary_key?(params[primary_key_name.to_sym])
 
             # Get The Data
             begin
@@ -70,7 +70,7 @@ module CrudService
             return 400 unless service.valid_update?(data)
 
             # Do Update
-            record = service.update_by_primary_key(params[:code],data)
+            record = service.update_by_primary_key(params[primary_key_name.to_sym],data)
 
             # Other Error
             return 500 if record.nil?
@@ -85,10 +85,10 @@ module CrudService
             service = settings.send(service_name)
 
             # Must Exist
-            return 404 unless service.exists_by_primary_key?(params[:code])
+            return 404 unless service.exists_by_primary_key?(params[primary_key_name.to_sym])
 
             # Do Delete
-            return 400 unless service.delete_by_primary_key(params[:code])
+            return 400 unless service.delete_by_primary_key(params[primary_key_name.to_sym])
 
             204
           end

data/lib/dal.rb

@@ -7,7 +7,7 @@ module CrudService
   # Your should extend this class to provide configuration for your dal, please see 
   # the README file at http://github.com/tomcully/crud-service
 	class Dal
-    attr_accessor :mysql, :memcache, :log, :table_name, :fields, :relations, :primary_key
+    attr_accessor :mysql, :memcache, :log, :table_name, :fields, :relations, :primary_key, :auto_primary_key, :cache_prefix
 
     # Create an instance.
     def initialize(mysql, memcache = nil, log) 
@@ -29,7 +29,7 @@ module CrudService
         table_versions = ""
 
         tables.each do |table|
-          tbversion = @memcache.get(table+"-version")
+          tbversion = @memcache.get("#{@cache_prefix}-"+table+"-version")
           if tbversion.nil?
             expire_table_cache([table]) 
             tbversion = 1
@@ -38,7 +38,7 @@ module CrudService
         end
 
         # Get the Query Hash
-        querymd5 = "geoservice-"+Digest::MD5.hexdigest(query+":"+table_versions)
+        querymd5 = "#{@cache_prefix}-"+Digest::MD5.hexdigest(query+":"+table_versions)
 
         # Read Cache and return if hit
         results = @memcache.get querymd5
@@ -189,6 +189,11 @@ module CrudService
       @mysql.escape(str)
     end
 
+    # Get the last insert id
+    def get_last_id
+      return @mysql.last_id
+    end
+
     # Get one record via a query
     def get_one(query)
       res = get_all_by_query(query)
@@ -358,7 +363,7 @@ module CrudService
       return if @memcache.nil?
 
       table_names.each do |table_name|
-        key = table_name+"-version"
+        key = "#{@cache_prefix}-"+table_name+"-version"
         version = @memcache.get(key)
         if version.nil?
           @memcache.set(key,1,nil,{:raw=>true}) 
@@ -427,7 +432,11 @@ module CrudService
 
       expire_table_cache(get_all_related_tables)
 
-      get_one({@primary_key => data[@primary_key]})
+      if @auto_primary_key
+        get_one({@primary_key => get_last_id})
+      else
+        get_one({@primary_key => data[@primary_key]})
+      end
     end
 
     # Update a record by its primary key from data

data/spec/unit/dal_spec.rb

@@ -8,6 +8,7 @@ describe CrudService::Dal do
 
     @generic_dal = CrudService::Dal.new(@mock_mysql, @mock_memcache, @mock_log)
     @generic_dal.table_name = "testtable"
+    @generic_dal.cache_prefix = "prefix"
   end
 
   describe '#initialize' do 
@@ -26,9 +27,9 @@ describe CrudService::Dal do
       mock_result = mysql_result_mock(testdata)
 
       query = 'test invalid query'
-      query_hash = "geoservice-"+Digest::MD5.hexdigest(query+":testtable-1")
+      query_hash = "prefix-"+Digest::MD5.hexdigest(query+":testtable-1")
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(1)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(1)
       @mock_memcache.should_receive(:get).ordered.with(query_hash).and_return(nil)
       @mock_mysql.should_receive(:query).with(query).and_return(mock_result)
       @mock_memcache.should_receive(:set).ordered.with(query_hash, testdata)
@@ -39,9 +40,9 @@ describe CrudService::Dal do
     it 'should not attempt to query the database on a cache hit' do
       testdata = [ { "field_one" => "one" } ]
       query = 'test invalid query'
-      query_hash = "geoservice-"+Digest::MD5.hexdigest(query+":testtable-1")
+      query_hash = "prefix-"+Digest::MD5.hexdigest(query+":testtable-1")
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(1)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(1)
       @mock_memcache.should_receive(:get).ordered.with(query_hash).and_return(testdata)
       @mock_mysql.should_not_receive(:query)
       @mock_memcache.should_not_receive(:set).ordered
@@ -65,11 +66,11 @@ describe CrudService::Dal do
       mock_result = mysql_result_mock(testdata)
 
       query = 'test invalid query'
-      query_hash = "geoservice-"+Digest::MD5.hexdigest(query+":testtable-1")
+      query_hash = "prefix-"+Digest::MD5.hexdigest(query+":testtable-1")
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(nil)
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(nil)
-      @mock_memcache.should_receive(:set).ordered.with("testtable-version",1,nil,{:raw=>true})
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(nil)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(nil)
+      @mock_memcache.should_receive(:set).ordered.with("prefix-testtable-version",1,nil,{:raw=>true})
       @mock_memcache.should_receive(:get).ordered.with(query_hash).and_return(nil)
       @mock_mysql.should_receive(:query).ordered.with(query).and_return(mock_result)
       @mock_memcache.should_receive(:set).ordered.with(query_hash, testdata)
@@ -83,18 +84,18 @@ describe CrudService::Dal do
       mock_result = mysql_result_mock(testdata)
 
       query = 'test invalid query'
-      query_hash = "geoservice-"+Digest::MD5.hexdigest(query+":testtable-1")
+      query_hash = "prefix-"+Digest::MD5.hexdigest(query+":testtable-1")
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(1)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(1)
       @mock_memcache.should_receive(:get).ordered.with(query_hash).and_return(nil)
       @mock_mysql.should_receive(:query).with(query).and_return(mock_result)
       @mock_memcache.should_receive(:set).ordered.with(query_hash, testdata)
 
       @generic_dal.cached_query(query,[]).should eq testdata
 
-      query_hash = "geoservice-"+Digest::MD5.hexdigest(query+":testtable-2")
+      query_hash = "prefix-"+Digest::MD5.hexdigest(query+":testtable-2")
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(2)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(2)
       @mock_memcache.should_receive(:get).ordered.with(query_hash).and_return(nil)
       @mock_mysql.should_receive(:query).with(query).and_return(mock_result)
       @mock_memcache.should_receive(:set).ordered.with(query_hash, testdata)
@@ -443,6 +444,13 @@ describe CrudService::Dal do
     end
   end
 
+  describe '#get_last_id' do
+    it 'should call mysql last_id' do
+       @mock_mysql.should_receive(:last_id)
+       @generic_dal.get_last_id
+    end
+  end
+
   describe '#get_one' do
     before(:each) do
       memcache_null(@mock_memcache)
@@ -778,26 +786,26 @@ describe CrudService::Dal do
   describe '#expire_table_cache' do
     it 'should set a table version when it doesnt exist' do
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(nil)
-      @mock_memcache.should_receive(:set).ordered.with("testtable-version",1,nil,{:raw=>true}).and_return(nil)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(nil)
+      @mock_memcache.should_receive(:set).ordered.with("prefix-testtable-version",1,nil,{:raw=>true}).and_return(nil)
 
       @generic_dal.expire_table_cache(['testtable'])
     end
 
     it 'should increment a table version when it exists' do
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(1)
-      @mock_memcache.should_receive(:incr).ordered.with("testtable-version",1,nil).and_return(nil)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(1)
+      @mock_memcache.should_receive(:incr).ordered.with("prefix-testtable-version",1,nil).and_return(nil)
 
       @generic_dal.expire_table_cache(['testtable'])
     end
 
     it 'should expire multiple tables' do
 
-      @mock_memcache.should_receive(:get).ordered.with("testtable-version").and_return(1)
-      @mock_memcache.should_receive(:incr).ordered.with("testtable-version",1,nil).and_return(nil)
-      @mock_memcache.should_receive(:get).ordered.with("tabletwo-version").and_return(1)
-      @mock_memcache.should_receive(:incr).ordered.with("tabletwo-version",1,nil).and_return(nil)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-testtable-version").and_return(1)
+      @mock_memcache.should_receive(:incr).ordered.with("prefix-testtable-version",1,nil).and_return(nil)
+      @mock_memcache.should_receive(:get).ordered.with("prefix-tabletwo-version").and_return(1)
+      @mock_memcache.should_receive(:incr).ordered.with("prefix-tabletwo-version",1,nil).and_return(nil)
 
       @generic_dal.expire_table_cache(['testtable','tabletwo'])
     end
@@ -1082,19 +1090,45 @@ describe CrudService::Dal do
       @generic_dal.fields = {
         "field_one" => { :type => :integer }
       }
+      @generic_dal.auto_primary_key = false
 
       query = "INSERT INTO `test_table` (`field_one`) VALUES ('one')"
 
       @mock_mysql.should_receive(:query).ordered.with(query)
+      @mock_mysql.should_not_receive(:last_id)
 
-      @mock_memcache.should_receive(:get).ordered.with('test_table-version').and_return(1)
-      @mock_memcache.should_receive(:incr).ordered.with('test_table-version',1,nil)
+      @mock_memcache.should_receive(:get).ordered.with('prefix-test_table-version').and_return(1)
+      @mock_memcache.should_receive(:incr).ordered.with('prefix-test_table-version',1,nil)
       
-      @mock_memcache.should_receive(:get).ordered.with('test_table-version').and_return(1)
+      @mock_memcache.should_receive(:get).ordered.with('prefix-test_table-version').and_return(1)
       @mock_memcache.should_receive(:get).ordered.and_return([{ "field_one" => "one","id"=>1 }])
             
       @generic_dal.insert(testdata)
     end
+
+    it 'should call last_id when auto_primary_key is true' do
+      testdata = { "field_one" => "one" }
+
+      @generic_dal.table_name = "test_table"
+      @generic_dal.fields = {
+        "field_one" => { :type => :integer }
+      }
+      @generic_dal.auto_primary_key = true
+
+      query = "INSERT INTO `test_table` (`field_one`) VALUES ('one')"
+
+      @mock_mysql.should_receive(:query).ordered.with(query)
+      @mock_mysql.should_receive(:last_id)
+
+      @mock_memcache.should_receive(:get).ordered.with('prefix-test_table-version').and_return(1)
+      @mock_memcache.should_receive(:incr).ordered.with('prefix-test_table-version',1,nil)
+      
+      @mock_memcache.should_receive(:get).ordered.with('prefix-test_table-version').and_return(1)
+      @mock_memcache.should_receive(:get).ordered.and_return([{ "field_one" => "one","id"=>1 }])
+      @mock_memcache.should_not_receive(:last_id)
+
+      @generic_dal.insert(testdata)
+    end
   end
 
   describe '#update_by_primary_key' do
@@ -1111,10 +1145,10 @@ describe CrudService::Dal do
 
       @mock_mysql.should_receive(:query).ordered.with(query)
       
-      @mock_memcache.should_receive(:get).ordered.with('test_table-version').and_return(1)
-      @mock_memcache.should_receive(:incr).ordered.with('test_table-version',1,nil)
+      @mock_memcache.should_receive(:get).ordered.with('prefix-test_table-version').and_return(1)
+      @mock_memcache.should_receive(:incr).ordered.with('prefix-test_table-version',1,nil)
       
-      @mock_memcache.should_receive(:get).ordered.with('test_table-version').and_return(1)
+      @mock_memcache.should_receive(:get).ordered.with('prefix-test_table-version').and_return(1)
       @mock_memcache.should_receive(:get).ordered.and_return([{ "field_one" => "two","id"=>2}])
       
       @generic_dal.update_by_primary_key(2, testdata)
@@ -1130,8 +1164,8 @@ describe CrudService::Dal do
       query = "DELETE FROM `test_table` WHERE (`code` = 'three')"
 
       @mock_mysql.should_receive(:query).ordered.with(query)
-      @mock_memcache.should_receive(:get).ordered.with('test_table-version').and_return(1)
-      @mock_memcache.should_receive(:incr).ordered.with('test_table-version',1,nil)
+      @mock_memcache.should_receive(:get).ordered.with('prefix-test_table-version').and_return(1)
+      @mock_memcache.should_receive(:incr).ordered.with('prefix-test_table-version',1,nil)
       
       @generic_dal.delete_by_primary_key('three')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crud-service
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tom Cully
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls