bustle 0.1.2 → 0.1.3

data/README.md

@@ -125,7 +125,10 @@ Bustle::Publishers.add post
 #### Create a Subscription
 
 ```ruby
+# returns a subscription instance upon duplicated entry
 Bustle::Subscriptions.add bustle_publisher, bustle_subscriber
+# raises error upon duplicated entry
+Bustle::Subscriptions.add! bustle_publisher, bustle_subscriber
 
 # example
 publisher  = Bustle::Publishers.get(Post.first)

data/lib/bustle/concerns/resource_collection.rb

@@ -3,12 +3,6 @@ module Bustle::Concern
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def add(resource)
-        add!(resource)
-      rescue
-        get(resource)
-      end
-
       def add!(resource)
         self::RESOURCE_NAME.constantize.to_adapter.create!(
           :resource_class => resource.class.name,
@@ -16,6 +10,12 @@ module Bustle::Concern
         )
       end
 
+      def add(resource)
+        add!(resource)
+      rescue
+        get(resource)
+      end
+
       def get(resource)
         self::RESOURCE_NAME.constantize.to_adapter.find_first(
           :resource_class => resource.class.name,

data/lib/bustle/subscriptions.rb

@@ -7,13 +7,19 @@ module Bustle
     include Concern::ForSubscriber
 
     class << self
-      def add(publisher, subscriber)
+      def add!(publisher, subscriber)
         Subscription.to_adapter.create!(
           :publisher_id  => publisher.id,
           :subscriber_id => subscriber.id
         )
       end
 
+      def add(publisher, subscriber)
+        add!(publisher, subscriber)
+      rescue
+        get(publisher, subscriber)
+      end
+
       def get(publisher, subscriber)
         Subscription.to_adapter.find_first(
           :publisher_id  => publisher.id,

data/lib/bustle/version.rb

@@ -1,3 +1,3 @@
 module Bustle
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/specs/bustle/subscriptions_spec.rb

@@ -20,6 +20,14 @@ module Bustle
       subscription.subscriber_id.should == subscriber.id
     end
 
+    it "gets a subscription if it already exists" do
+      Subscriptions.add(publisher, subscriber).should be_kind_of(Subscription)
+    end
+
+    it "gets a subscription if it already exists" do
+      expect { Subscriptions.add! publisher, subscriber }.to raise_error
+    end
+
     it "finds a subscription" do
       subscription = Subscriptions.get publisher, subscriber
 

data/specs/support/shared_examples/resource_collection.rb

@@ -1,5 +1,5 @@
 shared_examples 'resource_collection' do
-  let(:resource_class) { described_class::RESOURCE_NAME.constantize.to_adapter }
+  let(:resource_class) { described_class::RESOURCE_NAME.constantize }
 
   context "#add" do
     it "adds a model record" do
@@ -8,11 +8,11 @@ shared_examples 'resource_collection' do
 
     it "gets the model if it already exists" do
       described_class.add(user)
-      described_class.add(user).resource_class.should == 'Bustle::Dummy::User'
+      described_class.add(user).should be_kind_of(resource_class)
     end
 
     it "explicitly adds a model record" do
-      described_class.add!(user).resource_class.should == 'Bustle::Dummy::User'
+      described_class.add!(user).should be_kind_of(resource_class)
     end
 
     it "raises error if the model already exists" do
@@ -27,7 +27,7 @@ shared_examples 'resource_collection' do
     end
 
     it "adds a model record" do
-      model = resource_class.get(1)
+      model = resource_class.to_adapter.get(1)
       model.resource_class.should == 'Bustle::Dummy::User'
       model.resource_id.should == 42
     end
@@ -40,7 +40,7 @@ shared_examples 'resource_collection' do
 
     it "removes a model record" do
       described_class.remove(user)
-      resource_class.find_all({}).count.should == 0
+      resource_class.to_adapter.find_all({}).count.should == 0
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bustle
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1375749694743315937
+      hash: 2793893901465287910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1375749694743315937
+      hash: 2793893901465287910
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24