store-active_record 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced45712e34f5adc309c520e1eba87e0e81f8163
-  data.tar.gz: 6f53ae15b28c2185ecb97b06d5d61567da1131ba
+  metadata.gz: 9ed03bc3ce06165f5a57e2b101a4615e3b50b37a
+  data.tar.gz: cafff8805390a11ea7001fd97d232a058aa8650c
 SHA512:
-  metadata.gz: 0f955103252120301a4f78679be3d5139028c9eb13814360c06069cf9dc0bac5b3a4806f958d6fe24bc64d958d5109f6903753570fcad0a115798797f9b98b32
-  data.tar.gz: 6c03f111256cc5a7a6bb72b89c097424fe259ac487ee7f00810adf48d5bf930ac4384abdd9d66fb80ae14956bbf39aa94e7914ef288e5935fe0b44e4e4ee2853
+  metadata.gz: f1c02ecc0f6a32ec1ae002e5ec24863e21125de0a8d79dc2c60e5f15ae5f72de8f79b7ebe500ba9254ffd3167e53c399b2681a83c0112bd72701bc09b9bf267d
+  data.tar.gz: 0dc22af510ea697d1dec8c95672fd25fc6dcdb04787a2e86546701f92bd217ebd87e0e76c41f3a9710223097684949d4c83881de666b0823b389785b125a6ef5

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 *.swo
 config/database.yml
 store_active_record_test
+.rvmrc

data/README.md

@@ -22,17 +22,43 @@ Or install it yourself as:
 
 ## Usage
 
+Each table needs at least a uid column.
+
+With Rails
+
+```
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :uid
+    end
+  end
+end
+
+rake db:migrate
+```
+
+Without Rails
+
+```
+ActiveRecord::Migration.create_table('users') do |t|
+  t.string :uid
+end
+
+```
+
 ```
 require 'store/active_record'
 
 module DataMapper
   module User
-    class ActiveRecord < Store::ActiveRecord
+    class ActiveRecord < Store::DataMapper::ActiveRecord
     end
   end
 end
 
-table = 'User'
+table = 'users'
+
 spec = {
   :adapter => sqlite3
   :encoding => utf8
@@ -41,6 +67,27 @@ spec = {
   :database => database_name
 }
 
+# or load it from your database.yml
+# spec = YAML.load_file(path_to_your_database_yml)['production']
+#
+# database.yml
+# 
+# development:
+#   adapter: sqlite3
+#   encoding: utf8
+#   collation: utf8_general_ci
+#   reconnect: false
+#   database: database_name
+# 
+# test:
+#   adapter: sqlite3
+#   encoding: utf8
+#   collation: utf8_general_ci
+#   reconnect: false
+#   database: database_name_test
+# 
+# production: development
+
 DataMapper::User::ActiveRecord.new(table, spec)
 ```
 

data/lib/store/active_record/version.rb

@@ -1,5 +1,5 @@
 class Store
   class ActiveRecord
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/store/active_record.rb

@@ -6,11 +6,9 @@ class Store
   class DataMapper
     class ActiveRecord < Store::DataMapper
 
-      def initialize(table_name, spec)
+      def initialize(table_name)
         @table_name = table_name
-        @spec = spec
         build_class
-        establish_connection
       end
 
       def insert(data)
@@ -48,13 +46,12 @@ class Store
 
       private
 
-      def build_class
-        @cls = Class.new(base)
-        @cls.table_name = @table_name
-        @cls.send(:define_method, :uid) do
+      class StoredEntity < ::ActiveRecord::Base
+        def uid
           id.to_s
         end
-        @cls.send(:define_method, :to_hash) do
+
+        def to_hash
           attributes.tap do |a|
             a.delete('id')
             a['uid'] = uid
@@ -62,16 +59,14 @@ class Store
         end
       end
 
-      def cls
-        @cls
-      end
-
-      def establish_connection
-        base.establish_connection(@spec)
+      def build_class
+        StoredEntity.table_name = @table_name
+        StoredEntity.inheritance_column = 'sti_deactivated'
+        @cls = Class.new(StoredEntity)
       end
 
-      def base
-        ::ActiveRecord::Base
+      def cls
+        @cls
       end
 
       def find_by_id(id)

data/spec/active_record_spec.rb

@@ -3,31 +3,27 @@ require 'yaml'
 require 'store/spec'
 require "active_record"
 
-def create_test_table(table, spec)
-  ::ActiveRecord::Base.establish_connection(spec)
-  begin
-    ::ActiveRecord::Migration.drop_table(table)
-  rescue
-  ensure
-    ::ActiveRecord::Migration.create_table(table) do |t|
-      t.string :foo
-    end
-  end
-  ::ActiveRecord::Base.connection.close
-end
 
 describe Store::DataMapper::ActiveRecord do
-  spec = YAML.load_file("#{File.dirname(__FILE__)}/../config/database.yml.sample")['test']
-  table = 'Bar'
 
-  create_test_table(table, spec)
+  describe 'with active connection' do
 
-  before do
-    ActiveRecord::Base.connection.execute("DELETE FROM #{table};")
-  end
+    establish_connection
+    recreate_table
 
-  subject { Store::DataMapper::ActiveRecord.new(table, spec) }
-  instance_eval &Store::Spec::Specs
+    before { empty_table }
 
-end
+    subject { Store::DataMapper::ActiveRecord.new(table) }
+
+    it 'exists a active connection' do
+      assert ::ActiveRecord::Base.connected?
+    end
+
+    it 'deactivates sti for the moment' do
+      assert_equal 'sti_deactivated', subject.send(:cls).inheritance_column
+    end
 
+    run_subject_against_store_spec_gem
+  end
+
+end

data/spec/helper.rb

@@ -1,3 +1,36 @@
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'store/active_record'
+
+  def establish_connection
+    ::ActiveRecord::Base.establish_connection(spec)
+  end
+  
+  def recreate_table
+    begin
+      ::ActiveRecord::Migration.drop_table(table)
+    rescue
+    ensure
+      ::ActiveRecord::Migration.create_table(table) do |t|
+        t.string :foo
+      end
+    end
+  end
+  
+  def empty_table
+    ::ActiveRecord::Base.connection.execute("DELETE FROM #{table};")
+  end
+  
+  def run_subject_against_store_spec_gem
+    instance_eval &Store::Spec::Specs
+  end
+  
+  private
+  
+  def spec
+    @spec ||= YAML.load_file("#{File.dirname(__FILE__)}/../config/database.yml.sample")['test']
+  end
+  
+  def table
+    'Bar'
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store-active_record
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jan Owiesniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - Gemfile
 - LICENSE.txt

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 2.0.0@store-active_record --create