post_json 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90d8b0c0218c6e80aea604f49fe5ea5dfddff653
-  data.tar.gz: 4e8e16084b21f5909e1d1e2728e5a707483c050b
+  metadata.gz: ba717a41c7ab9e983103b70305d09b301e8c1130
+  data.tar.gz: 564e3a2eee9880edde739632a7223f7d571f78a6
 SHA512:
-  metadata.gz: cdb0d422a3cb9ae46eb28d2dc70e9c97ff2513e88654aa729ca207da8f8e835ce546813762446aadf588e298b721b72cb24ee36b69aab0c2ade5dc4b2d3b401e
-  data.tar.gz: a7e994fced38b80d2b2644555bef27d82a62d6a6f00d92719f64f60e19871710ae6e2cbd0456f9d7624de5bd7d924840aa036740f2f1e6b9c38d02ab3ccaf3f7
+  metadata.gz: 96775c8330a18731ec8ba1b56c7c30a1287a8824c50d9deae8e85f877638ed17c107d26a88f2a22876bcf36e157d499ec9138dccc6f5f3acdc4ca54769bf9f29
+  data.tar.gz: af55ee745807c8c1246651a319ec9978e4dc266fd84460840f5c79a14d240afc04543c57da37ad97af00d55205e88094b317171d3dca077d2cac155971e34403

data/README.md

@@ -158,7 +158,7 @@ Also, __notice you don't have to define model attributes anywhere!__
 We have created a feature we call `Dynamic Index`. It will automatically create indexes on slow queries, so queries 
 speed up considerably.
 
-PostJson will measure the duration of each `SELECT` query and instruct PostgreSQL to create an Expression Index, 
+PostJson will measure the duration of each `SELECT` query and instruct PostgreSQL to create an Index, 
 if the query duration is above a specified threshold.
 
 Each collection (like PostJson::Collection["people"]) have attribute `use_dynamic_index` (which is true by default) and 
@@ -168,7 +168,7 @@ Lets say that you execute the following query and the duration is above the thre
 
 `PostJson::Collection["people"].where(name: "Jacob").count`
 
-PostJson will create (unless it already exists) an Expression Index on `name` behind the scenes. The next time 
+PostJson will create (unless it already exists) an Index on `name` behind the scenes. The next time 
 you execute a query with `name` the performance will be much improved.
 
 ## Requirements

data/lib/post_json/base.rb

@@ -159,18 +159,11 @@ module PostJson
       end
 
       def default_scopes
-        if @collection_name
-          model_settings = ModelSettings.table_name
-          # query = original_all.joins("INNER JOIN #{model_settings} ON #{table_name}.__doc__model_settings_id = #{model_settings}.id")
-          # query = query.where("lower(#{model_settings}.collection_name) = ?", collection_name.downcase)
-
-          query = original_all.joins("INNER JOIN #{model_settings} ON lower(#{model_settings}.collection_name) = '#{collection_name.downcase}'")
-          query = query.where("#{table_name}.__doc__model_settings_id = #{model_settings}.id")
-
-          [Proc.new { query }] + super
-        else
-          [Proc.new { none }] + super
-        end
+        # query = original_all.where("\"#{table_name}\".__doc__model_settings_id = ?", settings_id)
+        model_settings = ModelSettings.table_name
+        query = original_all.joins("INNER JOIN \"#{model_settings}\" ON lower(\"#{model_settings}\".collection_name) = '#{collection_name.downcase}'")
+        query = query.where("\"#{table_name}\".__doc__model_settings_id = \"#{model_settings}\".id")
+        super + [Proc.new { query }]
       end
 
       def collection_name
@@ -185,12 +178,13 @@ end"
       def collection_name=(name)
         raise ArgumentError, "Collection name must be present" unless name.present?
         @collection_name = name.to_s.strip
+        reload_settings!
+        @collection_name
       end
 
       def rename_collection(new_name)
         new_name = new_name.to_s.strip
-        settings = find_settings
-        if settings
+        if settings.persisted?
           settings.collection_name = new_name
           settings.save!
         end
@@ -238,18 +232,18 @@ end"
         self.id = self.__doc__body['id'] = SecureRandom.uuid
       end
 
-      self.__doc__model_settings_id = __model__settings.id
+      self.__doc__model_settings_id = self.class.persisted_settings.id
       self.__doc__version = 1
 
-      if __model__settings.include_version_number == true &&
-         __doc__body_read_attribute(__model__settings.version_attribute_name) == nil
-        __doc__body_write_attribute(__model__settings.version_attribute_name, self.__doc__version)
+      if self.class.persisted_settings.include_version_number == true &&
+         __doc__body_read_attribute(self.class.persisted_settings.version_attribute_name) == nil
+        __doc__body_write_attribute(self.class.persisted_settings.version_attribute_name, self.__doc__version)
       end
 
-      if __model__settings.use_timestamps
+      if self.class.persisted_settings.use_timestamps
         __local__current_time = Time.zone.now.strftime('%Y-%m-%dT%H:%M:%S.%LZ')
-        __doc__body_write_attribute(__model__settings.created_at_attribute_name, __local__current_time)
-        __doc__body_write_attribute(__model__settings.updated_at_attribute_name, __local__current_time)
+        __doc__body_write_attribute(self.class.persisted_settings.created_at_attribute_name, __local__current_time)
+        __doc__body_write_attribute(self.class.persisted_settings.updated_at_attribute_name, __local__current_time)
       end
       super
     end
@@ -263,14 +257,14 @@ end"
         self.__doc__version = self.__doc__version + 1
       end
 
-      if __model__settings.include_version_number == true &&
-         __doc__body_attribute_changed?(__model__settings.version_attribute_name) == false
-        __doc__body_write_attribute(__model__settings.version_attribute_name, self.__doc__version)
+      if self.class.persisted_settings.include_version_number == true &&
+         __doc__body_attribute_changed?(self.class.persisted_settings.version_attribute_name) == false
+        __doc__body_write_attribute(self.class.persisted_settings.version_attribute_name, self.__doc__version)
       end
 
-      if __model__settings.use_timestamps && __doc__body_attribute_changed?(__model__settings.updated_at_attribute_name)
+      if self.class.persisted_settings.use_timestamps && __doc__body_attribute_changed?(self.class.persisted_settings.updated_at_attribute_name)
         __local__current_time = Time.zone.now.strftime('%Y-%m-%dT%H:%M:%S.%LZ')
-        __doc__body_write_attribute(__model__settings.updated_at_attribute_name, __local__current_time)
+        __doc__body_write_attribute(self.class.persisted_settings.updated_at_attribute_name, __local__current_time)
       end
       super
     end

data/lib/post_json/concerns/dynamic_index_methods.rb

@@ -4,11 +4,10 @@ module PostJson
 
     module ClassMethods
       def dynamic_indexes
-        settings = find_settings
-        if settings
-          DynamicIndex.indexed_selectors(settings.id)
-        else
+        if settings.new_record?
           []
+        else
+          DynamicIndex.indexed_selectors(settings.id)
         end
       end
 
@@ -17,16 +16,14 @@ module PostJson
       end
 
       def create_dynamic_indexes(*selectors)
-        settings = find_settings_or_create
-        DynamicIndex.ensure_index(settings.id, *selectors).count
+        DynamicIndex.ensure_index(persisted_settings.id, *selectors).count
       end
 
       def destroy_dynamic_index(selector)
-        settings = find_settings_or_create
-        if settings
-          DynamicIndex.destroy_index(settings.id, selector)
-        else
+        if settings.new_record?
           false
+        else
+          DynamicIndex.destroy_index(settings.id, selector)
         end
       end
     end

data/lib/post_json/concerns/settings_methods.rb

@@ -2,32 +2,37 @@ module PostJson
   module SettingsMethods
     extend ActiveSupport::Concern
 
-    def __model__settings
-      @__model__settings ||= self.class.find_settings_or_create
-    end
-
     module ClassMethods
-      def find_settings
-        ModelSettings.by_collection(collection_name).first
-      end
-
-      def find_settings_or_create
-        ModelSettings.by_collection(collection_name).first_or_create(collection_name: collection_name)
+      def settings
+        @settings ||= ModelSettings.by_collection(collection_name).first_or_initialize(collection_name: collection_name)
+      end
+
+      def persisted_settings
+        if settings.new_record?
+          existing = ModelSettings.by_collection(collection_name).first
+          if existing
+            updates = settings.changes.inject({}) {|result, (k,v)| result[k] = v[1]; result}
+            existing.update_attributes(updates)
+            @settings = existing
+          else
+            settings.save!
+          end
+        end
+        settings
       end
 
-      def find_settings_or_initialize
-        ModelSettings.by_collection(collection_name).first_or_initialize(collection_name: collection_name)
+      def reload_settings!
+        @settings = nil
+        settings
       end
 
       def read_settings_attribute(attribute_name)
         attribute_name = attribute_name.to_s
-        settings = find_settings_or_initialize
         settings[attribute_name]
       end
 
       def write_settings_attribute(attribute_name, value)
         attribute_name = attribute_name.to_s
-        settings = find_settings_or_initialize
         if settings[attribute_name] != value
           settings[attribute_name] = value 
           settings.save! 

data/lib/post_json/dynamic_index.rb

@@ -35,18 +35,6 @@ module PostJson
     validates :selector,    presence: true
 
     def index_name
-      # if defined?(@index_name)
-      #   @index_name
-      # else
-      #   prefix = "dyn_#{model_settings_id.gsub('-', '')}_"
-      #   @index_name = if 63 < prefix.length + selector.length
-      #                   digest = Digest::MD5.hexdigest(selector) 
-      #                   "#{prefix}#{digest}"[0..62]
-      #                 else
-      #                   "#{prefix}#{selector.gsub('.', '_')}"
-      #                 end
-      # end
-
       @index_name ||= unless @index_name
                         prefix = "dyn_#{model_settings_id.gsub('-', '')}_"
                         if 63 < prefix.length + selector.length
@@ -90,10 +78,12 @@ IF NOT EXISTS (
     AND    n.nspname = '#{current_schema}' -- 'public' by default
     ) THEN
 
-    CREATE INDEX #{index_name} ON #{current_schema}.#{Base.table_name} (json_selector('#{selector}', __doc__body)) WHERE __doc__model_settings_id = '#{model_settings_id.gsub('-', '')}';
+    CREATE INDEX #{index_name} ON #{current_schema}.#{Base.table_name} (json_selector('#{selector}', __doc__body));
 END IF;
 
 END$$;"
     end
   end
 end
+
+# CREATE INDEX #{index_name} ON #{current_schema}.#{Base.table_name} (json_selector('#{selector}', __doc__body)) WHERE __doc__model_settings_id = '#{model_settings_id.gsub('-', '')}';

data/lib/post_json/query_translator.rb

@@ -28,7 +28,7 @@ module PostJson
         select_duration = ActiveRecord::Base.connection.last_select_query_duration * 1000
         if model_class.use_dynamic_index == true &&
            model_class.create_dynamic_index_milliseconds_threshold < select_duration
-          selectors = select_query.scan(/.*?json_selector\('(.*?)', __doc__body\)/).flatten.uniq
+          selectors = select_query.scan(/.*?json_selector\('(.*?)', \"post_json_documents\"\.__doc__body\)/).flatten.uniq
           model_class.create_dynamic_indexes(selectors)
         end
         result

data/lib/post_json/version.rb

@@ -1,3 +1,3 @@
 module PostJson
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: post_json
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jacob Madsen and Martin Thoegersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails