superstore 1.0.12 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dbdeea44891e8279235f3499ffc43f2613024ca
-  data.tar.gz: 23d8acb6c14a91297b758df73ea54557d8ff353d
+  metadata.gz: 47de82fc0ed193ae01bdfd2a66b316a9c9ea0f98
+  data.tar.gz: d55d96966d9d241acbc653731797080a053dd6e9
 SHA512:
-  metadata.gz: 74c765f45c487870d43f97e6ffcf361a81c7e783476c2ad57d8764ce7e9abf54a11577a017e954272ac8900c019ce6e809bc8a750c87da445ce8c72bf48dd61c
-  data.tar.gz: e35465eeb0a7651c39e419789cee64e30872e27c8675a110b000b80bcf68f562dc08cafc3c9c1ab149e238b8c9607c325fe78410987b61b244ca136251d158e8
+  metadata.gz: 7be9c8c180e858358c94eba1e143588bba69ee1631321df79ffc4d6098b399fa25d565c8dcbe48d7a0970bc8f80f9dc91ff75597669a2bdb04b601f5fe227bb8
+  data.tar.gz: 8a16760f19d67f19061e73f71bd1857002b7ba8923c4d031f9044ca630627860be6a1d0ea11b313ff7a4c0567392e64cf6f46702eb5e98c7bcee7c348d4ac359

data/README.md

@@ -28,6 +28,15 @@ class Widget < Superstore::Base
   end
 end
 ```
+
+The table name defaults to the case-sensitive, pluralized name of the model class. To specify a
+custom name, set the ```table_name``` attribute on the class:
+
+```ruby
+class MyWidget < Superstore::Base
+  table_name = 'my_widgets'
+end
+```
 ## Using with Cassandra
 
 Add the cassandra-cql gem to Gemfile:
@@ -35,7 +44,7 @@ Add the cassandra-cql gem to Gemfile:
 ```ruby
 gem 'cassandra-cql'
 ```
-  
+
 Add a config/superstore.yml:
 
 ```yaml
@@ -55,7 +64,7 @@ Add the pg gem to your Gemfile:
 ```ruby
 gem 'pg'
 ```
-  
+
 And a config/superstore.yml:
 
 ```yaml
@@ -72,7 +81,7 @@ widget = Widget.new
 widget.valid?
 widget = Widget.create(name: 'Acme', price: 100)
 widget.update_attribute(:price, 1200)
-widget.update_attributes(price: 1200, name: 'Acme Corporation')
+widget.update(price: 1200, name: 'Acme Corporation')
 widget.attributes = {price: 300}
 widget.price_was
 widget.save
@@ -97,4 +106,4 @@ Some lightweight scoping features are available:
   Widget.where('color' => 'red')
   Widget.select(['name', 'color'])
   Widget.limit(10)
-```
+```

data/lib/superstore/adapters/cassandra_adapter.rb

@@ -12,7 +12,7 @@ module Superstore
 
         def to_query
           [
-            "SELECT #{select_string} FROM #{@scope.klass.column_family}",
+            "SELECT #{select_string} FROM #{@scope.klass.table_name}",
             @adapter.write_option_string,
             where_string,
             limit_string

data/lib/superstore/adapters/hstore_adapter.rb

@@ -12,7 +12,7 @@ module Superstore
 
         def to_query
           [
-            "SELECT #{select_string} FROM #{@scope.klass.column_family}",
+            "SELECT #{select_string} FROM #{@scope.klass.table_name}",
             where_string,
             order_string,
             limit_string

data/lib/superstore/callbacks.rb

@@ -18,11 +18,11 @@ module Superstore
         run_callbacks(:save) { super }
       end
 
-      def create #:nodoc:
+      def create_self #:nodoc:
         run_callbacks(:create) { super }
       end
 
-      def update(*) #:nodoc:
+      def update_self(*) #:nodoc:
         run_callbacks(:update) { super }
       end
   end

data/lib/superstore/model.rb

@@ -1,11 +1,21 @@
 module Superstore
   module Model
-    def column_family=(column_family)
-      @column_family = column_family
+    def table_name=(table_name)
+      @table_name = table_name
+    end
+
+    def table_name
+      @table_name ||= base_class.name.pluralize
     end
 
     def column_family
-      @column_family ||= base_class.name.pluralize
+      warn '`column_family` is deprecated & will be removed in superstore 2.0. Use `table_name` instead.'
+      table_name
+    end
+
+    def column_family=(table_name)
+      warn '`column_family=` is deprecated & will be removed in superstore 2.0. Use `table_name=` instead.'
+      self.table_name = table_name
     end
 
     def base_class

data/lib/superstore/persistence.rb

@@ -8,11 +8,11 @@ module Superstore
 
     module ClassMethods
       def remove(ids)
-        adapter.delete column_family, ids
+        adapter.delete table_name, ids
       end
 
       def delete_all
-        adapter.execute "TRUNCATE #{column_family}"
+        adapter.execute "TRUNCATE #{table_name}"
       end
 
       def create(attributes = {}, &block)
@@ -22,11 +22,11 @@ module Superstore
       end
 
       def insert_record(id, attributes)
-        adapter.insert column_family, id, encode_attributes(attributes)
+        adapter.insert table_name, id, encode_attributes(attributes)
       end
 
       def update_record(id, attributes)
-        adapter.update column_family, id, encode_attributes(attributes)
+        adapter.update table_name, id, encode_attributes(attributes)
       end
 
       def batching?
@@ -96,7 +96,7 @@ module Superstore
     end
 
     def save(*)
-      new_record? ? create : update
+      new_record? ? create_self : update_self
     end
 
     def destroy
@@ -110,16 +110,20 @@ module Superstore
       save(validate: false)
     end
 
-    def update_attributes(attributes)
+    def update(attributes)
       self.attributes = attributes
       save
     end
 
-    def update_attributes!(attributes)
+    alias update_attributes update
+
+    def update!(attributes)
       self.attributes = attributes
       save!
     end
 
+    alias update_attributes! update!
+
     def becomes(klass)
       became = klass.new
       became.instance_variable_set("@attributes", @attributes)
@@ -136,12 +140,12 @@ module Superstore
 
     private
 
-      def create
+      def create_self
         @new_record = false
         write :insert_record
       end
 
-      def update
+      def update_self
         write :update_record
       end
 

data/superstore.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'superstore'
-  s.version = '1.0.12'
+  s.version = '1.1.0'
   s.description = 'ActiveModel for many attributes'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/test/support/pg.rb

@@ -7,7 +7,9 @@ class PGInitializer
       'encoding'  => 'unicode',
       'database'  => 'superstore_test',
       'pool'      => 5,
-      'username' => 'postgres'
+      'host'      => 'localhost',
+      'password'  => 'postgres',
+      'username'  => 'postgres'
     }
 
     ActiveRecord::Base.configurations = { test: config }

data/test/test_helper.rb

@@ -20,7 +20,7 @@ module Superstore
   class TestCase < ActiveSupport::TestCase
     def temp_object(&block)
       Class.new(Superstore::Base) do
-        self.column_family = 'Issues'
+        self.table_name = 'Issues'
         string :force_save
         before_save { self.force_save = 'junk' }
 

data/test/unit/attribute_methods/typecasting_test.rb

@@ -8,7 +8,7 @@ class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
   end
 
   class TestIssue < Superstore::Base
-    self.column_family = 'Issues'
+    self.table_name = 'Issues'
 
     attribute :custom_column, type: CustomType, coder: CustomCoder
     boolean :enabled
@@ -92,7 +92,7 @@ class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
 
   test 'multiple attributes definition' do
     class MultipleAttributesIssue < Superstore::Base
-      self.column_family = 'Issues'
+      self.table_name = 'Issues'
     end
 
     assert_nothing_raised {
@@ -105,7 +105,7 @@ class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
 
   test 'multiple attributes with options' do
     class MultipleAttributesIssue < Superstore::Base
-      self.column_family = 'Issues'
+      self.table_name = 'Issues'
     end
 
     MultipleAttributesIssue.expects(:attribute).with(:hello, { :unique => :true, :type => :string })

data/test/unit/base_test.rb

@@ -14,7 +14,7 @@ class Superstore::BaseTest < Superstore::TestCase
   end
 
   test 'column family' do
-    assert_equal 'Superstore::BaseTest::Sons', Son.column_family
-    assert_equal 'Superstore::BaseTest::Sons', Grandson.column_family
+    assert_equal 'Superstore::BaseTest::Sons', Son.table_name
+    assert_equal 'Superstore::BaseTest::Sons', Grandson.table_name
   end
 end

data/test/unit/callbacks_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Superstore::CallbacksTest < Superstore::TestCase
   class TestIssue < Superstore::Base
-    self.column_family = 'Issues'
+    self.table_name = 'Issues'
     string :description
 
     %w(before_validation after_validation after_save after_create after_update after_destroy).each do |method|

data/test/unit/persistence_test.rb

@@ -111,15 +111,15 @@ class Superstore::PersistenceTest < Superstore::TestCase
     assert_equal 'lol', issue.description
   end
 
-  test 'update_attributes' do
+  test 'update' do
     issue = Issue.create
-    issue.update_attributes(description: 'lol')
+    issue.update(description: 'lol')
 
     assert !issue.changed?
     assert_equal 'lol', issue.description
   end
 
-  test 'update_attributes!' do
+  test 'update!' do
     begin
       Issue.validates(:description, presence: true)
 
@@ -127,7 +127,7 @@ class Superstore::PersistenceTest < Superstore::TestCase
       issue.save!
 
       assert_raise Superstore::RecordInvalid do
-        issue.update_attributes! description: ''
+        issue.update! description: ''
       end
     ensure
       Issue.reset_callbacks(:validate)
@@ -137,7 +137,7 @@ class Superstore::PersistenceTest < Superstore::TestCase
   test 'update nil attributes' do
     issue = Issue.create(title: 'I rule', description: 'lololol')
 
-    issue.update_attributes title: nil
+    issue.update title: nil
 
     issue = Issue.find issue.id
     assert_nil issue.title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel