web-connect 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b297a57d736e3dc2860b710c3fb2d53f9e962841
-  data.tar.gz: 20e06cbe434da29e8cba8171fd7a018f1e3c7f64
+  metadata.gz: 0a9ed1943020c61d303c0e1e41d655dbf3becd2e
+  data.tar.gz: fd67c5f26c24a6d04e6df66fa5440286791e1b17
 SHA512:
-  metadata.gz: 323eb6b99f136b4530bf1804879339a8909b642bf96f06f097231afabcec247c18a2cefe02718a0cc24080d365bf520a5f2d0454dc0a71a4ce64aab0d023d51e
-  data.tar.gz: f054a41d4dc3b02f4a22a8447320c3d111e83274172671c6e0d918c149e479af78ea9ac7f14f478c65c29ec49e59de09dfaaa03154b8b1140cea3d5afe74642d
+  metadata.gz: 61adc8afbf05c6d19b0d52922179bbf52c26ec1f9df200bcfaaaa4cf963857d1ad6359db07a0200aa0cf55d513469ae753b49ac2038e531711dad9240e7651a7
+  data.tar.gz: c3d75c7a605e8ce13acd1deaace6c1a026191fa525481cb73e3ad8f07c34736fd521c488317c573f49a77cbd3f41a03097d10430acb4c87234e7078ec1477011

data/lib/netfira/web_connect.rb

@@ -65,6 +65,10 @@ module Netfira
       @config.session_lifetime
     end
 
+    def self.paranoia?
+      !!@config.paranoia
+    end
+
     private
 
     def self.null_logger

data/lib/netfira/web_connect/configuration.rb

@@ -2,7 +2,7 @@ module Netfira::WebConnect
   class Configuration
 
     attr_accessor :db_table_prefix, :file_store, :authenticator, :custom_fields,
-                  :time_zone, :materialize_when_db_changed, :session_lifetime
+                  :time_zone, :materialize_when_db_changed, :session_lifetime, :paranoia
 
     attr_reader :logger, :db
 

data/lib/netfira/web_connect/db_schema/20140514_support.rb

@@ -4,7 +4,7 @@ class Support < Netfira::WebConnect::Migration
   def change
 
     create_table :_tables do |t|
-      t.string :name, limit: 50, indexed: true
+      t.string :name, limit: 50, index: true
       t.string :origin_key, limit: 20
       t.boolean :file
       t.boolean :writable
@@ -19,7 +19,7 @@ class Support < Netfira::WebConnect::Migration
     Netfira::WebConnect::Models::Shop.create id: 0
 
     create_table :_settings do |t|
-      t.references :shop
+      t.references :shop, index: true
       t.string :key
       t.binary :value, limit: 0x10000
       t.string :content_type
@@ -31,6 +31,8 @@ class Support < Netfira::WebConnect::Migration
       t.references :record
       t.string :key
       t.binary :value, limit: 0x10000
+      t.index [:shop_id, :table_id, :record_id], name: 'index_custom_fields'
+      t.index [:shop_id, :table_id, :record_id, :key], name: 'index_custom_fields_with_keys', unique: true
     end
 
     create_table :_sessions do |t|

data/lib/netfira/web_connect/migration.rb

@@ -22,13 +22,15 @@ module Netfira::WebConnect
       create_table table_name, options do |t|
         t.string options[:origin_key] || :"#{table_name.to_s.singularize}_id", index: true unless options[:writable]
         yield t
-        t.references :shop
+        t.references :shop, index: true
         if options[:sendable]
           t.binary :guid, index: true
           t.integer :delivery_status, default: 0, limit: 3, index: true
         end
         t.binary :digest, limit: 16
         t.timestamps
+        t.datetime :deleted_at
+        t.index :deleted_at
       end
       if @l10n_buffer
         create_l10n_table table_name do |t|
@@ -50,7 +52,7 @@ module Netfira::WebConnect
 
     def create_file_table(table_name)
       create_table table_name do |t|
-        t.references :shop
+        t.references :shop, index: true
         t.string :file_name, index: true
         t.string :remote_location
         t.string :locale
@@ -59,6 +61,8 @@ module Netfira::WebConnect
         t.binary :checksum, limit: 16
         t.binary :digest, limit: 16
         t.timestamps
+        t.datetime :deleted_at
+        t.index :deleted_at
       end
       add_table_def table_name, {}, true
     end
@@ -67,6 +71,9 @@ module Netfira::WebConnect
       first, second = [first, second].sort
       create_table :"#{first}_to_#{second}" do |t|
         t.references first.to_s.singularize, second.to_s.singularize, index: true
+        t.timestamps
+        t.datetime :deleted_at
+        t.index :deleted_at
       end
     end
 

data/lib/netfira/web_connect/model/record/materialization.rb

@@ -1,3 +1,5 @@
+require 'paranoia'
+
 module Netfira::WebConnect
   class Model::Record
     module Materialization
@@ -46,6 +48,9 @@ module Netfira::WebConnect
         # Set up sendable behaviour
         klass.include Model::Record::Sendable if klass.sendable?
 
+        # Set up paranoia (soft deletion)
+        klass.acts_as_paranoid if Netfira::WebConnect.paranoia?
+
         # Set up file record behaviour
         if klass.has_file?
           klass.has_attached_file :attachment, Netfira::WebConnect.file_store

data/lib/netfira/web_connect/model/record/serializer.rb

@@ -6,7 +6,7 @@ module Netfira::WebConnect
     module Serializer
       extend ActiveSupport::Concern
 
-      EXCLUDE_FROM_SERIALIZE = %w[id shop_id digest delivery_status created_at updated_at]
+      EXCLUDE_FROM_SERIALIZE = %w[id shop_id digest delivery_status created_at updated_at deleted_at]
 
       included do
 

data/lib/netfira/web_connect/model/record/translation.rb

@@ -25,6 +25,8 @@ module Netfira::WebConnect
         owner_class.has_many :translation_models,
                              class_name: klass.name,
                              inverse_of: :owner,
+                             # TODO: cleanup on `really_destroy!`
+                             dependent: Netfira::WebConnect.paranoia? ? nil : :delete_all,
                              autosave: true
 
         # Add translations to the default scope, as they will almost

data/lib/netfira/web_connect/model/relation.rb

@@ -12,6 +12,7 @@ module Netfira::WebConnect
         klass = Class.new(self)
         Models.const_set "#{name_a}To#{name_b}", klass
         klass.related_classes = [name_a, name_b].map{ |n| Models.const_get n.camelize.singularize }
+        klass.acts_as_paranoid if Netfira::WebConnect.paranoia?
       end
 
       def related_classes=(classes)
@@ -63,6 +64,7 @@ module Netfira::WebConnect
     end
 
     def records
+      self.class.current_scope = nil if Netfira::WebConnect.paranoia? # Fixes a bug triggered by paranoia
       self.class.related_classes.map{ |klass| __send__ klass.single_name.to_sym }
     end
 

data/lib/netfira/web_connect/version.rb

@@ -1,5 +1,5 @@
 module Netfira
   module WebConnect
-    VERSION = '0.1.10'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-connect
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -82,75 +82,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 description: |
   This is a Ruby version of Netfira's WebConnect server-side library
 email: