restpack_core_service 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0079ea5beff672cf761cf26dd696dc7d9301bf2
-  data.tar.gz: 3d6daa7f407bc0968314d4db0575532debdd20e8
+  metadata.gz: d2bee426ae4a23da2add15e79d02eeb7c4c0cc0a
+  data.tar.gz: f68631c3b3ce233431fa1e0691abce208c946e22
 SHA512:
-  metadata.gz: fdbf81e2a85258b4ac37a4ff9f1ca06aba231c5e389dea47414055e1277a4e3144e96e6107dbec42827a74c63b3e6bb7b9621f1722c4ea797e0ac6c657c6bc2a
-  data.tar.gz: fb5573d6972ed389a731f03a9cd4e04b46c2ee03ab6b2bfe0357253329b4b3152128491d72471d61efe8988da3a717252865a2f49388e0cffded2256513c1773
+  metadata.gz: 96ed4b9255544b9333a26498e0bfe5065056b53cff908637e6b7d662d59dce04b7bf2e9f4dae72cf4a786d9ed1ed821114afe6fc726b01fb843e0f2079cabd4a
+  data.tar.gz: 508c2670a7be016519b23039a89ee842ebd5faa16c5dec65e99e5ba2f944efe6e058aed768421aa3d163c9b4a0df724485fae375b22daf5da60a34571edf0491

data/Rakefile

@@ -1,4 +1,2 @@
 require "restpack_gem"
-require "active_support/inflector"
-
 RestPack::Gem::Tasks.load_service_tasks

data/db/migrate/20130807103945_create_applications.rb

@@ -5,7 +5,8 @@ class CreateApplications < ActiveRecord::Migration
 
   def change
     create_table table_name do |t|
-      t.string :name, :null => false, :limit => 256
+      t.string  :name, :null => false, :limit => 256
+      t.string  :api_token, :null => false, :limit => 512
       t.integer :account_id, :null => false
 
       t.timestamps

data/db/migrate/20130808135549_create_hosts.rb

@@ -0,0 +1,16 @@
+class CreateHosts < ActiveRecord::Migration
+  def table_name
+    RestPack::Core::Service.config.prefix_db_table(:hosts)
+  end
+
+  def change
+    create_table table_name do |t|
+      t.string  :name, :null => false, :limit => 256
+      t.integer :application_id, :null => false
+      t.string  :session_secret, :null => false, :limit => 128
+      t.json    :oauth_providers, :null => false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/{20130807104142_create_domains.rb → 20130808135613_create_domains.rb}

@@ -5,8 +5,8 @@ class CreateDomains < ActiveRecord::Migration
 
   def change
     create_table table_name do |t|
-      t.string :host, :null => false, :limit => 512
-      t.integer :application_id, :null => false
+      t.string :identifier, :null => false, :limit => 512
+      t.integer :host_id, :null => false
 
       t.timestamps
     end

data/lib/restpack_core_service.rb

@@ -6,7 +6,12 @@ require "restpack_core_service/configuration"
 
 require "restpack_core_service/models/base"
 require "restpack_core_service/models/application"
+require "restpack_core_service/models/host"
 require "restpack_core_service/models/domain"
 
+require "restpack_core_service/services"
 require "restpack_core_service/tasks"
 
+Models = RestPack::Core::Service::Models
+Commands = RestPack::Core::Service::Commands
+# Serializers = RestPack::Core::Service::Serializers

data/lib/restpack_core_service/models/application.rb

@@ -6,6 +6,10 @@ module RestPack::Core::Service::Models
     validates_presence_of :name, :account_id
     validates :name, :length => { :maximum => 256 }
 
-    has_many :domains
+    has_many :hosts
+
+    before_save -> {
+      self.api_token ||= SecureRandom.hex(50)[0..31]
+    }
   end
 end

data/lib/restpack_core_service/models/domain.rb

@@ -1,11 +1,11 @@
 module RestPack::Core::Service::Models
   class Domain < Base
     restpack_table_name :domains
-    attr_accessible :host, :application
+    attr_accessible :identifier, :host
 
-    validates_presence_of :host
-    validates :host, :length => { :maximum => 512 }
+    validates_presence_of :identifier
+    validates :identifier, :length => { :maximum => 512 }
 
-    belongs_to :application
+    belongs_to :host
   end
 end

data/lib/restpack_core_service/models/host.rb

@@ -0,0 +1,17 @@
+module RestPack::Core::Service::Models
+  class Host < Base
+    restpack_table_name :hosts
+    attr_accessible :name, :application_id, :session_secret, :oauth_providers
+
+    validates_presence_of :name, :application_id
+    validates :name, :length => { :maximum => 256 }
+
+    has_many :domains
+    belongs_to :application
+
+    before_save -> {
+      self.oauth_providers ||= {}
+      self.session_secret ||= SecureRandom.hex(16)
+    }
+  end
+end

data/lib/restpack_core_service/serializers/user_serializer.rb

@@ -0,0 +1,11 @@
+module RestPack::Core::Service::Serializers
+  class UserSerializer
+    include RestPack::Serializer
+
+    self.model_class = RestPack::User::Service::Models::User
+    self.key = :users
+
+    # attributes :id, :application_id, :user_id, :title, :content, :latitude, :longitude,
+    #            :tags, :access, :data, :href, :updated_at, :created_at
+  end
+end

data/lib/restpack_core_service/services.rb

@@ -0,0 +1,5 @@
+module RestPack::Core::Service::Commands
+
+end
+
+require "restpack_core_service/services/application/verify_api_token"

data/lib/restpack_core_service/services/application/verify_api_token.rb

@@ -0,0 +1,17 @@
+module RestPack::Core::Service::Commands::Application
+  class VerifyApiToken < RestPack::Service::Command
+    required do
+      integer :id
+      string :api_token
+    end
+
+    def execute
+      application = Models::Application.find_by_id_and_api_token(
+        inputs[:id],
+        inputs[:api_token]
+      )
+
+      status :forbidden if !application
+    end
+  end
+end

data/lib/restpack_core_service/tasks/db.rake

@@ -33,7 +33,7 @@ namespace :restpack do
     task :configuration do
       p "RestPack::Core::Service Configuration"
       p "--------------------------------"
-      p "database_table_prefix: #{RestPack::Core::Service.config.db_table_prefix}"
+      p "db_table_prefix: #{RestPack::Core::Service.config.db_table_prefix}"
     end
   end
 end

data/lib/restpack_core_service/version.rb

@@ -1,7 +1,7 @@
 module RestPack
   module Core
     module Service
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

data/restpack_core_service.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "restpack_service",       "~> 0.0.28"
-  spec.add_dependency "restpack_serializer",    "~> 0.4.1"
-  spec.add_dependency "restpack_gem",           "~> 0.0.11"
+  spec.add_dependency "restpack_service"
+  spec.add_dependency "restpack_serializer"
+  spec.add_dependency "restpack_gem"
   spec.add_dependency "sinatra",                "~> 1.4.3"
   spec.add_dependency "pg",                     "~> 0.16"
 
@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "bump"
   spec.add_development_dependency "shoulda-matchers", "~> 1.4.2"
+  spec.add_development_dependency "factory_girl", "~> 4.0"
 end

data/spec/factories/application_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :application, :class => Models::Application do
+    sequence(:name) {|n| "Application ##{n}" }
+    sequence(:account_id)
+  end
+end

data/spec/factories/domain_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :domain, :class => Models::Domain do
+    sequence(:identifier) {|n| "subdomain_#{n}.domain.com" }
+    host
+  end
+end

data/spec/factories/host_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :host, :class => Models::Host do
+    sequence(:name) {|n| "Host ##{n}" }
+    application
+  end
+end

data/spec/models/application_spec.rb

@@ -2,6 +2,16 @@ describe RestPack::Core::Service::Models::Application do
   it { should validate_presence_of(:name) }
   it { should validate_presence_of(:account_id) }
   it { should ensure_length_of(:name).is_at_most(256) }
-  it { should have_many(:domains) }
+  it { should have_many(:hosts) }
   it { subject.class.table_name.should == 'restpack_applications' }
+
+  context "default values" do
+    it "has a random api_token" do
+      app1 = create(:application)
+      app2 = create(:application)
+
+      app1.api_token.length.should == 32
+      app1.api_token.should_not == app2.api_token
+    end
+  end
 end

data/spec/models/domain_spec.rb

@@ -1,6 +1,6 @@
 describe RestPack::Core::Service::Models::Domain do
-  it { should validate_presence_of(:host) }
-  it { should ensure_length_of(:host).is_at_most(512) }
-  it { should belong_to(:application) }
+  it { should validate_presence_of(:identifier) }
+  it { should ensure_length_of(:identifier).is_at_most(512) }
+  it { should belong_to(:host) }
   it { subject.class.table_name.should == 'restpack_domains' }
 end

data/spec/models/host_spec.rb

@@ -0,0 +1,22 @@
+describe RestPack::Core::Service::Models::Host do
+  it { should validate_presence_of(:name) }
+  it { should validate_presence_of(:application_id) }
+  it { should ensure_length_of(:name).is_at_most(256) }
+  it { should belong_to(:application) }
+  it { should have_many(:domains) }
+  it { subject.class.table_name.should == 'restpack_hosts' }
+
+  context "default values" do
+    it "has a random session_secret" do
+      host1 = create(:host)
+      host2 = create(:host)
+
+      host1.session_secret.should_not == nil
+      host1.session_secret.should_not == host2.session_secret
+    end
+
+    it "has empty oauth_providers as default" do
+      create(:host).oauth_providers.should == {}
+    end
+  end
+end

data/spec/services/application/verify_api_token_spec.rb

@@ -0,0 +1,49 @@
+require_relative '../../spec_helper'
+
+describe Commands::Application::VerifyApiToken do
+  is_required :id, :api_token
+
+  let(:response) { subject.class.run(params) }
+
+  before do
+    @application = create(:application)
+  end
+
+  context 'with valid params' do
+    let(:params) { {
+      id: @application.id,
+      api_token: @application.api_token
+    } }
+
+    it 'is valid' do
+      response.success?.should == true
+      response.result.should == {}
+    end
+  end
+
+  context 'with invalid :id' do
+    let(:params) { {
+      id: 142857,
+      api_token: @application.api_token
+    }}
+
+    it 'is forbidden' do
+      response.success?.should == false
+      response.result.should == {}
+      response.status.should == :forbidden
+    end
+  end
+
+  context 'with invalid :api_token' do
+    let(:params) { {
+      id: @application.id,
+      api_token: 'invalid_token'
+    }}
+
+    it 'is forbidden' do
+      response.success?.should == false
+      response.result.should == {}
+      response.status.should == :forbidden
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,20 +1,20 @@
-require 'active_record'
-require 'rspec'
-require 'database_cleaner'
-require 'yaml'
-require 'shoulda-matchers'
+require 'restpack_service/support/spec_helper'
 require 'restpack_core_service'
 
 config = YAML.load_file('./config/database.yml')
 ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'] || config['test'])
 
-migrations_path = File.dirname(__FILE__) + "/../db/migrate"
+migrations_path = File.dirname(__FILE__) + "/../db/migratore"
 migrator = ActiveRecord::Migrator.new(:up, migrations_path)
 migrator.migrate
 
+FactoryGirl.find_definitions
+
 DatabaseCleaner.strategy = :transaction
 
 RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+
   config.before(:each) do
     DatabaseCleaner.start
   end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: restpack_core_service
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restpack_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: restpack_serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: restpack_gem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Applications, Domains and Configurations service
 email:
 - gavinjoyce@gmail.com
@@ -179,19 +193,29 @@ files:
 - Rakefile
 - config/database.yml
 - db/migrate/20130807103945_create_applications.rb
-- db/migrate/20130807104142_create_domains.rb
+- db/migrate/20130808135549_create_hosts.rb
+- db/migrate/20130808135613_create_domains.rb
 - lib/restpack_core_service.rb
 - lib/restpack_core_service/configuration.rb
 - lib/restpack_core_service/models/application.rb
 - lib/restpack_core_service/models/base.rb
 - lib/restpack_core_service/models/domain.rb
+- lib/restpack_core_service/models/host.rb
+- lib/restpack_core_service/serializers/user_serializer.rb
+- lib/restpack_core_service/services.rb
+- lib/restpack_core_service/services/application/verify_api_token.rb
 - lib/restpack_core_service/tasks.rb
 - lib/restpack_core_service/tasks/db.rake
 - lib/restpack_core_service/version.rb
 - restpack_core_service.gemspec
 - spec/configuration_spec.rb
+- spec/factories/application_factory.rb
+- spec/factories/domain_factory.rb
+- spec/factories/host_factory.rb
 - spec/models/application_spec.rb
 - spec/models/domain_spec.rb
+- spec/models/host_spec.rb
+- spec/services/application/verify_api_token_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/RestPack
 licenses:
@@ -219,6 +243,11 @@ specification_version: 4
 summary: Applications, Domains and Configurations
 test_files:
 - spec/configuration_spec.rb
+- spec/factories/application_factory.rb
+- spec/factories/domain_factory.rb
+- spec/factories/host_factory.rb
 - spec/models/application_spec.rb
 - spec/models/domain_spec.rb
+- spec/models/host_spec.rb
+- spec/services/application/verify_api_token_spec.rb
 - spec/spec_helper.rb