nodevent 3.1.9 → 3.2.0

data/Gemfile

@@ -5,4 +5,3 @@ source 'https://rubygems.org'
 gem 'rspec'
 gem 'rails'
 gem 'redis'
-gem 'httparty'

data/Gemfile.lock

@@ -1,102 +1,98 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    httparty (0.9.0)
-      multi_json (~> 1.0)
-      multi_xml
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.7)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.0.4)
-    multi_xml (0.5.1)
+    mime-types (1.21)
+    multi_json (1.6.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.6)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.3)
+    rdoc (3.12.1)
       json (~> 1.4)
-    redis (3.0.1)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    redis (3.0.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    sprockets (2.1.3)
+    rspec-mocks (2.12.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.15.4)
+    thor (0.17.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  httparty
   rails
   redis
   rspec

data/lib/nodevent.rb

@@ -1,9 +1,9 @@
 require 'digest/sha2'
 require 'json'
 require 'redis'
-require 'nodevent/net_publisher'
 
 module NoDevent
+  HOUR = 60 * 60
 
   def self.included(base)
     raise "No longer supported, Please include NoDevent::Base instead"
@@ -37,6 +37,9 @@ module NoDevent
       Emitter.room_key(self.room, expires)
     end
 
+    def room_json(expires_after=HOUR)
+      {room: room, key: room_key(Time.now + expires_after)}
+    end
 
     def nodevent_create
       NoDevent::Emitter.emit(self.class.name, 'create', self)
@@ -50,14 +53,15 @@ module NoDevent
     
 
   module Helper
-    def javascript_include_nodevent
+    def nodevent_url
       host = NoDevent::Emitter.config['host']
       namespace = NoDevent::Emitter.config['namespace']
       namespace = '/' + namespace unless namespace[0] == '/'
-
-
-      "<script src='#{host}/api#{namespace}' type='text/javascript'></script>".html_safe
-    end    
+      "#{host}/api#{namespace}"
+    end
+    def javascript_include_nodevent
+      "<script src='#{nodevent_url}' type='text/javascript'></script>".html_safe
+    end
   end
   ActionView::Base.send :include, Helper if defined?(ActionView::Base)
 
@@ -72,11 +76,6 @@ module NoDevent
 
           @@publisher = Redis.new(:host => r_config["host"], :port => r_config["port"], :db => r_config["db"])
         end
-        if @@config.keys.include?("spigot.io")
-          @@publisher = NoDevent::NetPublisher.new(obj)
-          config["namespace"] = @@publisher.namespace
-          config["secret"] = @@publisher.secret
-        end
       end
 
       def config

data/lib/nodevent/version.rb

@@ -1,3 +1,3 @@
 module Nodevent
-  VERSION = "3.1.9"
+  VERSION = "3.2.0"
 end

data/nodevent.gemspec

@@ -16,5 +16,4 @@ Gem::Specification.new do |gem|
   gem.version       = Nodevent::VERSION
   
   gem.add_dependency('redis', '>= 2.0.0')
-  gem.add_dependency('httparty', '>= 0.9.0')
 end

data/spec/base_spec.rb

@@ -45,21 +45,6 @@ describe NoDevent do
       it { should == $redis}
 
     end
-
-    describe "with an api_key" do
-      before do
-        NoDevent::Emitter.config = {
-            "host" => "http://thehost",
-            "namespace" => "/nodevent",
-            "secret" => "asdf",
-            "spigot.io" => {
-              "api_key"=> "bar",
-            }
-        }
-      end
-      it { should be_an_instance_of(NoDevent::NetPublisher)}
-      it { should_not == $redis}
-    end
   end
   describe ".config=" do
     describe "the class" do
@@ -128,6 +113,16 @@ describe NoDevent do
       end
       let(:instance) {ModelMock.new( 'theparam') }
 
+      describe "#room_json" do
+        before { Time.stub(:now => Time.new(2011, 1, 10))}
+        subject {instance.room_json(2 * NoDevent::HOUR)}
+        it "should have both the room name and the key" do
+          subject.keys.should =~ [:room, :key]
+          subject[:key].should == instance.room_key(Time.now + 2*NoDevent::HOUR)
+          subject[:room].should == instance.room
+        end
+      end
+
       it { instance.room.should == "ModelMock_theparam" }
       it "should emit to the right room" do
         NoDevent::Emitter.publisher.should_receive(:publish).with("/nodevent",
@@ -216,5 +211,5 @@ describe NoDevent do
         end
       end
     end
-   end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nodevent
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 description: Write a gem description
 email:
 - cconstan@gmail.com
@@ -59,12 +43,10 @@ files:
 - README.md
 - Rakefile
 - lib/nodevent.rb
-- lib/nodevent/net_publisher.rb
 - lib/nodevent/version.rb
 - nodevent.gemspec
 - spec/base_spec.rb
 - spec/emitter_spec.rb
-- spec/net_publisher_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/cconstantine/NoDevent-gem
 licenses: []
@@ -86,12 +68,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Write a gem summary
 test_files:
 - spec/base_spec.rb
 - spec/emitter_spec.rb
-- spec/net_publisher_spec.rb
 - spec/spec_helper.rb

data/lib/nodevent/net_publisher.rb

@@ -1,59 +0,0 @@
-require 'httparty'
-
-module NoDevent
-  class NetPublisher
-    include HTTParty
-
-    # HTTParty settings
-    headers  'ContentType' => 'application/json' ,'Accept' => 'application/json'
-
-    format :json
-    default_timeout 5
-
-    HOSTNAME="spigot.io"
-
-    attr_accessor :namespace
-    attr_accessor :secret
-    attr_accessor :api_key
-
-    def initialize(opts)
-      self.api_key = opts["spigot.io"]["api_key"]
-      self.namespace = opts["namespace"]
-      self.secret = opts["secret"]
-
-      unless self.namespace
-        body = generate_namespace.body
-        resp = JSON.parse body
-        self.namespace = "/" + resp["id"]
-        self.secret = resp["secret"]
-      end
-    end
-
-    def publish(where, message)
-      message = JSON.parse(message)
-      req = {
-          :body => {
-              :api_key => api_key,
-              :event   => message["event"],
-              :room    => message["room"],
-              :message => message["message"]
-          }
-      }
-      self.class.post("http://#{HOSTNAME}/namespaces#{where}/emit",req)
-
-    end
-
-    def generate_namespace
-      require "socket"
-      hostname = Socket.gethostname
-      suffix = " (#{Rails.env})" if defined?(Rails)
-      req = {
-              :body => {
-                  :api_key   => api_key,
-                  :namespace => {"name" => "#{hostname}#{suffix}"}
-              }
-            }
-      self.class.post("http://#{HOSTNAME}/namespaces",req)
-    end
-  end
-end

data/spec/net_publisher_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe ::NoDevent::NetPublisher do
-  let(:net_publisher) {NoDevent::NetPublisher.new(params)}
-  subject { net_publisher }
-
-  pending "a running service" do
-    context "without a namespace" do
-      let(:params) do
-        {
-            "spigot.io" => {"api_key" => "f2343b5d54557ee368a37a5d77ccd0c6"}
-        }
-      end
-      it "does something" do
-        subject.namespace.should be_present
-      end
-      context "#publish" do
-        subject {net_publisher.publish(net_publisher.namespace, {:room => "the_room", :event => "the_event", :message => "the_message"}.to_json)}
-        it {should be_success}
-      end
-    end
-  end
-end