gutentag-multitenancy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 189f617a953d1d1ceaacd4bc7de82b3e8d54cd71
-  data.tar.gz: b51023d31ed942fdc6c611e35be263ce5fcb50e0
+  metadata.gz: 4a7eea8660402646a7d4b0f18eb09e905e53be2d
+  data.tar.gz: 3280af671b3436e8a0da4aa2ac32f15265343ba4
 SHA512:
-  metadata.gz: e0f8260ef48289d684a9411f20efd0e9d80a82cdd50264e745de80f4b481f390f0736768d93b41baf64f732a82537614b441ff9ad83c893583b7e701464b306a
-  data.tar.gz: 84fa5812352a81daf6b877e7c0c760682eebb845907349d5f9629200e1bc70f9348fe5708c87900b23667c364f930f2461df7f2c4fa0fd9f4082a028a7d6263a
+  metadata.gz: bce357c5d2ab86e9057c1ff75557728bafa323e8fd838959ac38888871423e9e47b9a628506a7ae02695edea136aadd422588cfa1f300f1b2c396bb1b549d714
+  data.tar.gz: a314d7fa1b73ffdd14a5d8796d65e6ba0758ea35acce263b0d79d75d9e4e8f7e8f106ca794a273e295c287f22bb9f1b9c0b883395d913d2fae67688f14241140

data/README.md

@@ -13,28 +13,18 @@ If you haven't installed Gutentag yet, [install](https://github.com/pat/gutentag
 gem 'gutentag', github: 'pat/gutentag', ref: '51bd8f2f37f21dc4ef84a87889db4f28aa3573e2'
 ```
 
-Now run the following migration (TODO: make a generator for this!):
-
-```ruby
-add_column :gutentag_tags, :tenant_id, :integer, null: false
-
-remove_index :gutentag_tags, :name
-add_index :gutentag_tags, [:name, :tenant_id], unique: true
-```
-
-Add this line to your application's Gemfile:
+Add `gutentag_multitenancy` to your Gemfile, and `bundle install`:
 
 ```ruby
 gem 'gutentag-multitenancy'
 ```
 
-And then execute:
-
-    $ bundle
+Now import and run the migration:
 
-Or install it yourself as:
-
-    $ gem install gutentag-multitenancy
+```
+rake gutentag_multitenancy:install:migrations
+rake db:migrate
+```
 
 
 ## Usage
@@ -59,6 +49,10 @@ To retrieve all the tags for a tenant, use the `by_tenant_id` scope:
 Gutentag::Tag.by_tenant_id 42
 ```
 
+## To Do
+
+- Tests.
+
 
 ## License
 

data/db/migrate/1_alter_tags.rb

@@ -0,0 +1,15 @@
+class AlterTags < ActiveRecord::Migration
+  def up
+    add_column :gutentag_tags, :tenant_id, :integer, null: false
+
+    remove_index :gutentag_tags, :name
+    add_index :gutentag_tags, [:name, :tenant_id], unique: true
+  end
+
+  def down
+    remove_index :gutentag_tags, [:name, :tenant_id]
+    add_index :gutentag_tags, :name, unique: true
+
+    remove_column :gutentag_tags, :tenant_id
+  end
+end

data/lib/gutentag/multitenancy.rb

@@ -8,4 +8,8 @@ require "gutentag/multitenancy/version"
 require "gutentag/multitenancy/tenant_tagger"
 require "gutentag/multitenancy/taggable"
 require "gutentag/multitenancy/engine"
+require "gutentag/multitenancy/tag_extensions"
+require "#{Gutentag::Engine.root}/app/models/gutentag/tag.rb"
+
+Gutentag::Tag.send :include, Gutentag::Multitenancy::TagExtensions
 

data/lib/gutentag/multitenancy/engine.rb

@@ -1,5 +1,3 @@
-require "#{Gutentag::Engine.root}/app/models/gutentag/tag.rb"
-
 module Gutentag
   module Multitenancy
 
@@ -7,20 +5,6 @@ module Gutentag
       engine_name :gutentag_multitenancy
 
       ActiveSupport.on_load :active_record do
-        Gutentag::Tag.class_eval do
-          attr_accessible :tenant_id if ::ActiveRecord::VERSION::MAJOR == 3
-
-          scope :by_tenant_id, ->(tenant_id) { where tenant_id: tenant_id }
-
-          def self.find_by_name_and_tenant_id(name, tenant_id)
-            where(tenant_id: tenant_id).find_by_name(name)
-          end
-
-          def self.find_or_create_by_name_and_tenant_id(name, tenant_id)
-            find_by_name_and_tenant_id(name, tenant_id) || create(name: name, tenant_id: tenant_id)
-          end
-        end
-
         include Taggable
       end
     end

data/lib/gutentag/multitenancy/tag_extensions.rb

@@ -0,0 +1,26 @@
+module Gutentag
+  module Multitenancy
+    module TagExtensions
+
+      def self.included(base)
+        base.attr_accessible :tenant_id if ::ActiveRecord::VERSION::MAJOR == 3
+
+        base.class_eval do
+          scope :by_tenant_id, ->(tenant_id) { where tenant_id: tenant_id }
+        end
+
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def find_by_name_and_tenant_id(name, tenant_id)
+          where(tenant_id: tenant_id).find_by_name(name)
+        end
+
+        def find_or_create_by_name_and_tenant_id(name, tenant_id)
+          find_by_name_and_tenant_id(name, tenant_id) || create(name: name, tenant_id: tenant_id)
+        end
+      end
+    end
+  end
+end

data/lib/gutentag/multitenancy/version.rb

@@ -1,5 +1,5 @@
 module Gutentag
   module Multitenancy
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag-multitenancy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andy Stewart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,9 +78,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- db/migrate/1_alter_tags.rb
 - gutentag-multitenancy.gemspec
 - lib/gutentag/multitenancy.rb
 - lib/gutentag/multitenancy/engine.rb
+- lib/gutentag/multitenancy/tag_extensions.rb
 - lib/gutentag/multitenancy/taggable.rb
 - lib/gutentag/multitenancy/tenant_tagger.rb
 - lib/gutentag/multitenancy/version.rb