acts_as_nosql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6557e20a7d3813b7250a1a6b4e346d07e3b8f89b9ad984d66c6632e8e172bf9e
-  data.tar.gz: 8ddacccc9e46e5102dc4056fd4a139e6dde8302e15bd108f66ab7b15214880e7
+  metadata.gz: 932b7a11efc91e47391a1aefa78baebe7fa8cb32d540db3af678e857a46dceaf
+  data.tar.gz: 5d4333d029ff28bee728b3e7b1fd565ac18e44413be9d4ebd355234505501bcc
 SHA512:
-  metadata.gz: cf9a0fdfba234f852ffd8fc97fe18b709eaff996037da995bccb672696f03d749ac52e4dc2a82306c87f8bb12efd4f7d9f942a43718bb86d309d6b169fd868dd
-  data.tar.gz: 39662c4f73d0d4f1468a1e02d95ddb6624a907079a9ae4984b449356e51bc5ebf631c162508946f330035747591131f469249e8c72b5484ef0fc6c569aca3e5f
+  metadata.gz: 48dce7dc8ee54cb447f7cd1172d563d97acb6faadc931aac0e3cc1780e927e0315b5d5e448252f766231010838ec98542e9996549b88cc898e5a1d92720c1814
+  data.tar.gz: '090a9ac2ae392d8f8750d0b2162c2969e3cebd401e7a5b5ad1a6b76b56c4ed1335c28dc9c72542d390a64460882499d83ab0596e9b46df285161703052215378'

data/lib/acts_as_nosql/attributes.rb

@@ -4,10 +4,10 @@ module ActsAsNosql
     extend ActiveSupport::Concern
 
     included do
-      after_initialize :_acts_as_nosql_init
+      after_initialize :_acts_as_nosql_init_defaults
     end
 
-    def _acts_as_nosql_init
+    def _acts_as_nosql_init_defaults
       self.class.nosql_attributes.each do |name, attribute|
         public_send("#{name}=", attribute.default.dup) if public_send(name).nil? && !attribute.default.nil?
       end
@@ -22,7 +22,7 @@ module ActsAsNosql
         attribute = self._acts_as_nosql_options[:field_name]
 
         names.each do |name|
-          raise "Attribute #{name} already defined" if instance_methods.include?(name.to_sym) || name.to_sym == attribute.to_sym
+          raise "Attribute #{name} already defined" if _acts_as_nosql_attribute_defined?(name)
 
           nosql_attributes[name] = ActsAsNosql::Attribute.new(name, type: type, default: default, path: path)
           _acts_as_nosql_define_attribute(nosql_attributes[name])
@@ -33,12 +33,36 @@ module ActsAsNosql
         self._acts_as_nosql_options[:attributes] ||= {}
       end
 
+      def connection
+        unless acts_as_nosql_conflicts_checked?
+          @acts_as_nosql_conflicts_checked = true
+          acts_as_nosql_check_conflicts!
+        end
+        super
+      end
+
+      def acts_as_nosql_conflicts_checked?
+        @acts_as_nosql_conflicts_checked ||= false
+      end
+
+      def acts_as_nosql_check_conflicts!
+        columns_map = columns.index_by(&:name)
+        nosql_attributes.each do |name, attribute|
+          raise "Attribute #{name} already defined" if columns_map[name.to_s]
+        end
+      end
+
       private
 
       def nosql_data_attribute
         @nosql_data_attribute ||= self._acts_as_nosql_options[:field_name]
       end
 
+      def _acts_as_nosql_attribute_defined?(name)
+        instance_methods.include?(name.to_sym) ||
+          name.to_sym == nosql_data_attribute.to_sym
+      end
+
       def _acts_as_nosql_define_attribute(nosql_attribute)
         attribute = nosql_data_attribute
 

data/lib/acts_as_nosql/version.rb

@@ -1,3 +1,3 @@
 module ActsAsNosql
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/spec/acts_as_nosql/model_spec.rb

@@ -34,11 +34,45 @@ describe 'Fields declaration' do
     expect { Article.nosql_attr :data }.to raise_error("Attribute data already defined")
   end
 
+  it 'raises error if there\'s a name conflict an actual column' do
+    expect { Article.nosql_attr :title }.to raise_error("Attribute title already defined")
+  end
+
+  it 'raises error if there\'s a name conflict an existing nosql attribute' do
+    expect { Article.nosql_attr :body }.to raise_error("Attribute body already defined")
+  end
+
   it 'raises error if there\'s a name conflict' do
     expect { Article.nosql_attr :some_column }.to raise_error("Attribute some_column already defined")
   end
 
-  it 'fileds are saved as string' do
+  it 'raises error if there\'s a name conflict when calling #acts_as_nosql_check_conflicts!' do
+    expect do
+      class ConflictingArticle < ActiveRecord::Base
+        self.table_name = 'articles'
+        acts_as_nosql field_name: :data
+
+        nosql_attrs :title, :editor, type: String
+      end
+    end.not_to raise_error("Attribute title already defined")
+
+    expect { ConflictingArticle.acts_as_nosql_check_conflicts! }.to raise_error("Attribute title already defined")
+  end
+
+  it 'raises error if there\'s a name conflict when the model columns are loaded' do
+    expect do
+      class ConflictingArticle2 < ActiveRecord::Base
+        self.table_name = 'articles'
+        acts_as_nosql field_name: :data
+
+        nosql_attrs :title, :editor, type: String
+      end
+    end.not_to raise_error("Attribute title already defined")
+
+    expect { ConflictingArticle2.new }.to raise_error("Attribute title already defined")
+  end
+
+  it 'fields are saved as string' do
     subject.editor = 'John Doe'
     subject.save!
     subject.reload

data/spec/acts_as_nosql/querying_spec.rb

@@ -16,9 +16,16 @@ describe 'Querying' do
 
     it 'can be queried' do
       query = Article.where(body: 'body')
-      # expect(query.to_sql).to eq(
-      #   "SELECT \"articles\".* FROM \"articles\" WHERE (\"articles\".\"data\"->>\"body\" = 'body')"
-      # )
+      expect(query.to_sql).to include(
+        case ENV['ACTIVE_RECORD_ADAPTER']
+        when 'postgresql'
+          "SELECT \"articles\".* FROM \"articles\" WHERE (\"articles\".\"data\"->>'body' = 'body')"
+        when 'mysql'
+          "SELECT `articles`.* FROM `articles` WHERE (`articles`.`data`->>'$.body' = 'body')"
+        else
+          "SELECT \"articles\".* FROM \"articles\" WHERE (\"articles\".\"data\"->>'$.body' = 'body')"
+        end
+      )
       expect(query.to_a).to contain_exactly(article)
     end
   end
@@ -36,9 +43,16 @@ describe 'Querying' do
 
     it 'can query nested attributes' do
       query = Setting.where(user_auth_token: '123123')
-      # expect(query.to_sql).to eq(
-      #   "SELECT \"settings\".* FROM \"settings\" WHERE (\"settings\".\"config\"->>\"user\"->>\"auth\"->>\"token\" = '123123')"
-      # )
+      expect(query.to_sql).to eq(
+        case ENV['ACTIVE_RECORD_ADAPTER']
+        when 'postgresql'
+          "SELECT \"settings\".* FROM \"settings\" WHERE (\"settings\".\"config\"->'user'->'auth'->>'token' = '123123')"
+        when 'mysql'
+          "SELECT `settings`.* FROM `settings` WHERE (`settings`.`config`->>'$.user.auth.token' = '123123')"
+        else
+          "SELECT \"settings\".* FROM \"settings\" WHERE (\"settings\".\"config\"->>'$.user.auth.token' = '123123')"
+        end
+      )
       expect(query.to_a).to contain_exactly(setting)
     end
   end

data/spec/support/schema.rb

@@ -4,6 +4,7 @@ if ENV['ACTIVE_RECORD_ADAPTER'] == 'mysql'
   puts 'Running on MySQL...'
   ActiveRecord::Base.establish_connection(
     adapter: 'mysql2',
+    host: ENV['DB_HOST'] || '127.0.0.1',
     username: ENV['DB_USERNAME'] || 'root',
     password: ENV['DB_PASSWORD'],
     database: 'acts_as_nosql'
@@ -14,8 +15,8 @@ elsif ENV['ACTIVE_RECORD_ADAPTER'] == 'postgresql'
     adapter: 'postgresql',
     database: 'acts_as_nosql',
     host: ENV['DB_HOST'] || '127.0.0.1',
-    username: ENV['DB_USERNAME'] || 'postgres',
-    password: ENV['DB_PASSWORD']
+    username: ENV['DB_USERNAME'] || ENV['POSTGRES_USER'] || 'postgres',
+    password: ENV['DB_PASSWORD'] || ENV['POSTGRES_PASSWORD']
   )
 else
   puts 'Running on SQLite...'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_nosql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mònade