verge 0.0.2 → 0.0.3

data/Rakefile

@@ -10,14 +10,14 @@ begin
     gem.email = "adam@wartube.com"
     gem.homepage = "http://github.com/adamelliot/verge"
     gem.authors = ["Adam Elliot"]
-    gem.add_dependency "sinatra"
-    gem.add_dependency "datamapper"
-    gem.add_dependency "bcrypt-ruby"
-    gem.add_dependency "activesupport"
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "factory_girl"
-    gem.add_development_dependency "rack-test"
-    gem.add_development_dependency "do_sqlite3"
+    gem.add_dependency "sinatra", ">= 0.9.4"
+    gem.add_dependency "datamapper", ">= 0.10.1"
+    gem.add_dependency "bcrypt-ruby", ">= 2.1.2"
+    gem.add_dependency "activesupport", ">= 2.3.4"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "factory_girl", ">= 1.2.3"
+    gem.add_development_dependency "rack-test", "0.5.0"
+    gem.add_development_dependency "do_sqlite3", "0.10.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/verge/server/base.rb

@@ -59,7 +59,7 @@ module Verge
       private
 
       def extract_site # nodoc #
-        site = Site.find_by_url(request.referer)
+        site = Site.find_by_uri(request.referer)
         (site.nil? && halt(401, "Not a valid site.")) || site
       end
 

data/lib/verge/server/models.rb

@@ -6,7 +6,7 @@ require 'dm-timestamps'
 
 require 'activesupport'
 
-DataMapper::setup(:default, ENV['DATABASE_URL'] || "sqlite3:///#{Dir.pwd}/../db.sqlite3")
+DataMapper::setup(:default, ENV['DATABASE_URL'] || "sqlite3:///#{Dir.pwd}/database.sqlite3")
 
 module Verge
   module Server
@@ -105,12 +105,12 @@ module Verge
       include DataMapper::Resource
 
       property :id,         Serial, :key => true
-      property :domain,     String, :length => 3..300
+      property :host,       String, :length => 3..300
       property :signature,  String, :length => 128..128, :default => lambda { Verge::Crypto.token }
 
       has n, :signed_tokens
 
-      validates_is_unique :domain
+      validates_is_unique :host
       validates_is_unique :signature
 
       before :destroy, :destroy_signed_tokens
@@ -127,14 +127,13 @@ module Verge
         signed_tokens.create(:value => sign(token.user.login, token.value), :token => token)
       end
 
-      # Searchs all the sites for ones that match the protocol and domain
+      # Searchs all the sites for ones that match the host
       #   EG:
       #    "http://verge.example.com/some/path?id=1" will match
       #    "verge.example.com"
-      def self.find_by_url(url)
-        return nil if url.nil?
-        domain = url[/^([A-Za-z\d]*(:\/\/)){0,1}([^\/]*)/, 3]
-        Site.first(:domain => domain)
+      def self.find_by_uri(uri)
+        return nil if uri.nil?
+        Site.first(:host => uri[/^([A-Za-z\d]*\:\/\/){0,1}([^\/]*)/, 2])
       end
 
       private

data/lib/verge.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-
 module Verge
   autoload :Crypto, "verge/crypto"
   

data/spec/factories.rb

@@ -1,5 +1,5 @@
 Factory.sequence(:login) { |n| "verge-#{n}" }
-Factory.sequence(:domain) { |n| "site-#{n}.com" }
+Factory.sequence(:host) { |n| "site-#{n}.com" }
 
 Factory.define(:user, :class => Verge::Server::User) do |u|
   u.login { Factory.next(:login) }
@@ -7,7 +7,7 @@ Factory.define(:user, :class => Verge::Server::User) do |u|
 end
 
 Factory.define(:site, :class => Verge::Server::Site) do |s|
-  s.domain { Factory.next(:domain) }
+  s.host { Factory.next(:host) }
 end
 
 Factory.define(:signed_token, :class => Verge::Server::SignedToken) do |s|

data/spec/models_spec.rb

@@ -132,11 +132,11 @@ describe Verge::Server::Site do
     Verge::Server::SignedToken.count.should eql(Verge::Server::Site.count)
   end
   
-  it "returns a site when the domain and protocol match" do
+  it "returns a site when the host matches" do
     site1 = Factory(:site)
-    site2 = Verge::Server::Site.find_by_url("http://#{site1.domain}/some/other/path?junk=10&true=false")
+    site2 = Verge::Server::Site.find_by_uri("http://#{site1.host}/some/other/path?junk=10&true=false")
     site2.should_not be_nil
-    site2.domain.should eql(site1.domain)
+    site2.host.should eql(site1.host)
   end
   
   it "should create a valid signed token when signing" do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'verge'
 require 'spec'
 require 'spec/autorun'

data/spec/verge_spec.rb

@@ -16,7 +16,7 @@ describe Verge::Server do
 
   before :each do
     @site = Factory(:site)
-    header("Referer", @site.domain)
+    header("Referer", @site.host)
   end
   
   describe "GET to /token.js" do
@@ -103,7 +103,7 @@ describe Verge::Server do
       @user = Factory(:user)
       @signed_token = @user.token.signed_tokens.first(:site_id => @site.id)
       
-      header("Referer", @site.domain)
+      header("Referer", @site.host)
     end
  
     it "fails if no regisered site is found" do

data/verge.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{verge}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Elliot"]
@@ -55,33 +55,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<datamapper>, [">= 0"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<factory_girl>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<do_sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_runtime_dependency(%q<datamapper>, [">= 0.10.1"])
+      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<factory_girl>, [">= 1.2.3"])
+      s.add_development_dependency(%q<rack-test>, ["= 0.5.0"])
+      s.add_development_dependency(%q<do_sqlite3>, ["= 0.10.0"])
     else
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<datamapper>, [">= 0"])
-      s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<factory_girl>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_dependency(%q<datamapper>, [">= 0.10.1"])
+      s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<factory_girl>, [">= 1.2.3"])
+      s.add_dependency(%q<rack-test>, ["= 0.5.0"])
+      s.add_dependency(%q<do_sqlite3>, ["= 0.10.0"])
     end
   else
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<datamapper>, [">= 0"])
-    s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<factory_girl>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+    s.add_dependency(%q<datamapper>, [">= 0.10.1"])
+    s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<factory_girl>, [">= 1.2.3"])
+    s.add_dependency(%q<rack-test>, ["= 0.5.0"])
+    s.add_dependency(%q<do_sqlite3>, ["= 0.10.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: verge
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Adam Elliot
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: datamapper
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: bcrypt-ruby
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: factory_girl
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
@@ -78,9 +78,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: do_sqlite3
@@ -88,9 +88,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.0
     version: 
 description: Simple system that grants trusted sites tokens if users have successfully authenticated. So they are free to interact with each other securely.
 email: adam@wartube.com