restpack_core_service 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504634bab2bf42ecded107859f2945e18a0df86f
-  data.tar.gz: d8d5fedf8d9dce3edc41bc5d3cf6bbce4e254be7
+  metadata.gz: 06476cdc6cf44f1be4d5bed3842b47576a802fc0
+  data.tar.gz: 8b2ab8a320a733eeeefbdc986ec727eda16d2198
 SHA512:
-  metadata.gz: d8bd5796073fbd62000fe529561a636508aaa2039561e04cd86c46fcff8bc00dbc54446bf087ea0805edc11c9acaa44f3381f9e72bb21eb4b5e168ec841b9f4a
-  data.tar.gz: bc2c6b127ba0757ea07d0ed3006ecb3db2613f3e55551ea9b7f28bd6b46a1d39939ea15d4d0126074279d6e272d0ff19c4859f6c267798acda098b10d6063f40
+  metadata.gz: 72eb8670eef9a691df897d040545d216fed30ccd84552c6c59740cc51422cbd38a39da05e2dabeb84eb4fd7c628f5b78a17f2b9133844f625470fcae4bf2278c
+  data.tar.gz: 68d41507f4540fb4ba203aa987af9407f880df300cfedbf05b677a392f36a70d2a4267c3588bfa24dc71ac70eba15070e3da66960f8bf9493e0aa60d0aebc934

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in restpack_core_service.gemspec
 gemspec

data/db/migrate/{20130807103945_create_applications.rb → 20130807103946_create_applications.rb}

@@ -1,6 +1,6 @@
 class CreateApplications < ActiveRecord::Migration
   def change
-    create_table :restpack_applications do |t|
+    create_table :restpack_core_applications do |t|
       t.string  :name, :null => false, :limit => 256
       t.string  :api_token, :null => false, :limit => 512
       t.integer :account_id, :null => false

data/db/migrate/{20130808135549_create_domains.rb → 20130808135550_create_domains.rb}

@@ -1,6 +1,6 @@
 class CreateDomains < ActiveRecord::Migration
   def change
-    create_table :restpack_domains do |t|
+    create_table :restpack_core_domains do |t|
       t.string  :identifier, :null => false, :limit => 215
       t.integer :application_id, :null => false
       t.boolean :is_verified, :null => false, :default => false

data/lib/restpack_core_service.rb

@@ -1,23 +1,3 @@
-require "active_record"
-require "restpack_service"
-require "restpack_serializer"
+require 'restpack_service'
 
-require "active_support/core_ext"
-
-require "restpack_core_service/version"
-require "restpack_core_service/configuration"
-
-require "restpack_core_service/models/application"
-require "restpack_core_service/models/domain"
-
-require "restpack_core_service/serializers/application_serializer"
-require "restpack_core_service/serializers/domain_serializer"
-
-require "restpack_core_service/services"
-require "restpack_core_service/tasks"
-
-module Core
-  Models = RestPack::Core::Service::Models
-  Commands = RestPack::Core::Service::Commands
-  Serializers = RestPack::Core::Service::Serializers
-end
+RestPack::Service::Loader.load 'restpack_core_service', 'Core'

data/lib/restpack_core_service/commands/application/create.rb

@@ -0,0 +1,14 @@
+module Commands::Core::Application
+  class Create < RestPack::Service::Commands::Create
+    required do
+      array :applications do
+        hash do
+          required do
+            integer :account_id
+            string :name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/restpack_core_service/commands/application/get.rb

@@ -0,0 +1,8 @@
+module Commands::Core::Application
+  class Get < RestPack::Service::Commands::Get
+    required do
+      integer :id
+      integer :account_id
+    end
+  end
+end

data/lib/restpack_core_service/commands/application/list.rb

@@ -0,0 +1,13 @@
+module Commands::Core::Application
+  class List < RestPack::Service::Commands::List
+    required do
+      integer :account_id
+    end
+
+    optional do
+      integer :page
+      integer :page_size
+      string :include
+    end
+  end
+end

data/lib/restpack_core_service/{services → commands}/application/verify_api_token.rb

@@ -1,4 +1,4 @@
-module RestPack::Core::Service::Commands::Application
+module Commands::Core::Application
   class VerifyApiToken < RestPack::Service::Command
     required do
       integer :id
@@ -6,7 +6,7 @@ module RestPack::Core::Service::Commands::Application
     end
 
     def execute
-      application = Core::Models::Application.find_by_id_and_api_token(
+      application = Models::Core::Application.find_by_id_and_api_token(
         inputs[:id],
         inputs[:api_token]
       )

data/lib/restpack_core_service/{services → commands}/domain/by_identifier.rb

@@ -1,13 +1,13 @@
 require 'public_suffix'
 
-module RestPack::Core::Service::Commands::Domain
+module Commands::Core::Domain
   class ByIdentifier < RestPack::Service::Command
     required do
       string :identifier
     end
 
     optional do
-      string :includes
+      string :include
     end
 
     def execute
@@ -17,9 +17,9 @@ module RestPack::Core::Service::Commands::Domain
       ]
 
       identifiers.reject(&:nil?).each do |identifier|
-        result = Core::Serializers::DomainSerializer.resource(
+        result = Serializers::Core::Domain.resource(
           inputs,
-          Core::Models::Domain.where(identifier: identifier)
+          Models::Core::Domain.where(identifier: identifier)
         )
 
         if result[:domains].any?

data/lib/restpack_core_service/commands/domain/create.rb

@@ -0,0 +1,14 @@
+module Commands::Core::Domain
+  class Create < RestPack::Service::Commands::Create
+    required do
+      array :domains do
+        hash do
+          required do
+            integer :application_id
+            string :identifier
+          end
+        end
+      end
+    end
+  end
+end

data/lib/restpack_core_service/commands/domain/get.rb

@@ -0,0 +1,8 @@
+module Commands::Core::Domain
+  class Get < RestPack::Service::Commands::Get
+    required do
+      integer :id
+      integer :application_id
+    end
+  end
+end

data/lib/restpack_core_service/commands/domain/list.rb

@@ -0,0 +1,13 @@
+module Commands::Core::Domain
+  class List < RestPack::Service::Commands::List
+    required do
+      integer :application_id
+    end
+
+    optional do
+      integer :page
+      integer :page_size
+      string :include
+    end
+  end
+end

data/lib/restpack_core_service/commands/domain/update.rb

@@ -0,0 +1,48 @@
+module Commands::Core::Domain
+  class Update < RestPack::Service::Command
+    required do
+      array :domains do
+        hash do
+          required do
+            integer :id
+            integer :application_id
+          end
+
+          optional do
+            array :oauth_providers do
+              hash do
+                required do
+                  string :identifier
+                  string :key
+                  string :secret
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    def execute
+      #TODO: GJ: wrap in transaction
+      result = {
+        domains: []
+      }
+
+      inputs[:domains].each do |domain_inputs|
+        domain = Models::Core::Domain.find_by_id_and_application_id(
+          domain_inputs[:id], domain_inputs[:application_id]
+        )
+
+        if domain
+          domain.update_attributes(domain_inputs)
+          result[:domains] << Serializers::Core::Domain.as_json(domain)
+        else
+          status :not_found
+        end
+      end
+
+      return result
+    end
+  end
+end

data/lib/restpack_core_service/models/application.rb

@@ -1,6 +1,6 @@
-module RestPack::Core::Service::Models
+module Models::Core
   class Application < ActiveRecord::Base
-    self.table_name = :restpack_applications
+    self.table_name = :restpack_core_applications
     attr_accessible :name, :account_id
 
     validates_presence_of :name, :account_id

data/lib/restpack_core_service/models/domain.rb

@@ -1,6 +1,6 @@
-module RestPack::Core::Service::Models
+module Models::Core
   class Domain < ActiveRecord::Base
-    self.table_name = :restpack_domains
+    self.table_name = :restpack_core_domains
     attr_accessible :identifier, :application_id, :is_verified, :session_secret, :oauth_providers
 
     validates_presence_of :identifier, :application_id
@@ -9,7 +9,7 @@ module RestPack::Core::Service::Models
     belongs_to :application
 
     before_save -> {
-      self.oauth_providers ||= {}
+      self.oauth_providers ||= []
       self.session_secret ||= SecureRandom.hex(16)
     }
   end

data/lib/restpack_core_service/serializers/application.rb

@@ -0,0 +1,13 @@
+module Serializers::Core
+  class Application
+    include RestPack::Serializer
+
+    self.model_class = Models::Core::Application
+    self.key = :applications
+
+    attributes :id, :name, :account_id
+
+    can_include :domains
+    can_filter_by :account_id
+  end
+end

data/lib/restpack_core_service/serializers/domain.rb

@@ -0,0 +1,14 @@
+module Serializers::Core
+  class Domain
+    include RestPack::Serializer
+
+    self.model_class = Models::Core::Domain
+    self.key = :domains
+
+    attributes :id, :identifier, :application_id, :is_verified,
+               :session_secret, :oauth_providers
+
+    can_include :applications
+    can_filter_by :application_id
+  end
+end

data/lib/restpack_core_service/version.rb

@@ -1,7 +1,7 @@
 module RestPack
   module Core
     module Service
-      VERSION = "0.0.11"
+      VERSION = "0.0.12"
     end
   end
 end

data/restpack_core_service.gemspec

@@ -19,11 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "restpack_service"
-  spec.add_dependency "restpack_serializer"
-  spec.add_dependency "restpack_gem"
   spec.add_dependency "public_suffix",          "~> 1.3.1"
-  spec.add_dependency "sinatra",                "~> 1.4.3"
-  spec.add_dependency "pg",                     "~> 0.16"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "database_cleaner", "~> 1.0.1"

data/spec/commands/application/create_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Commands::Core::Application::Create do
+  it_acts_as_create_command(:core, :application)
+
+  pending 'validate command inputs'
+end

data/spec/commands/application/get_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Commands::Core::Application::Get do
+  is_required :id, :account_id
+
+  let(:response) { subject.class.run(params) }
+  let(:params) { {} }
+
+  before do
+    @application = create(:application)
+  end
+
+  context 'with valid params' do
+    let(:params) { {
+      id: @application.id,
+      account_id: @application.account_id
+    } }
+
+    it 'is valid' do
+      response.success?.should == true
+    end
+
+    it 'return the application' do
+      response.result[:applications].length.should == 1
+      response.result[:applications].first[:id].should == @application.id.to_s
+    end
+  end
+end

data/spec/commands/application/list_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Commands::Core::Application::List do
+  is_required :account_id
+  is_optional :page, :page_size
+
+  before do
+    @applications = create_list(:application, 5)
+  end
+
+  context 'listing' do
+    let(:response) { subject.class.run(params) }
+
+    context 'by :account_id' do
+      before { create_list(:application, 3, account_id: 142857) }
+
+      context 'valid' do
+        let(:params) { { account_id: 142857 } }
+        it 'returns correct applications' do
+          response.result[:meta][:applications][:count].should == 3
+        end
+      end
+
+      context 'invalid' do
+        let(:params) { { account_id: 999999 } }
+        it 'returns no applications' do
+          response.result[:meta][:applications][:count].should == 0
+        end
+      end
+    end
+  end
+end

data/spec/{services → commands}/application/verify_api_token_spec.rb

@@ -1,6 +1,6 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Core::Commands::Application::VerifyApiToken do
+describe Commands::Core::Application::VerifyApiToken do
   is_required :id, :api_token
 
   let(:response) { subject.class.run(params) }

data/spec/{services → commands}/domain/by_identifier_spec.rb

@@ -1,8 +1,8 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Core::Commands::Domain::ByIdentifier do
+describe Commands::Core::Domain::ByIdentifier do
   is_required :identifier
-  is_optional :includes
+  is_optional :include
 
   let(:response) { subject.class.run(params) }
 
@@ -13,7 +13,7 @@ describe Core::Commands::Domain::ByIdentifier do
   context 'with valid params' do
     let(:params) { {
       identifier: @domain.identifier,
-      includes: 'applications'
+      include: 'applications'
     } }
 
     it 'is valid' do
@@ -33,7 +33,7 @@ describe Core::Commands::Domain::ByIdentifier do
     context 'with subdomain in identifier' do
       let(:params) { {
         identifier: "www.#{@domain.identifier}",
-        includes: 'applications'
+        include: 'applications'
       } }
 
       it 'is valid' do

data/spec/commands/domain/create_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Commands::Core::Domain::Create do
+  it_acts_as_create_command(:core, :domain)
+
+  pending 'validate command inputs'
+  pending 'test invalid domain formats ("hostname", "no spaces", ip addresses...)'
+end

data/spec/factories/api_application_factory.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :api_application, class: Hash do
+    sequence(:name) {|n| "Application ##{n}" }
+    sequence(:account_id)
+
+    initialize_with { attributes }
+  end
+end

data/spec/factories/api_domain_factory.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :api_domain, class: Hash do
+    sequence(:identifier) {|n| "domain_#{n}.com" }
+    sequence(:application_id)
+
+    initialize_with { attributes }
+  end
+end

data/spec/factories/application_factory.rb

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

data/spec/factories/domain_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :domain, :class => Core::Models::Domain do
+  factory :domain, :class => Models::Core::Domain do
     application
     sequence(:identifier) {|n| "domain_#{n}.com" }
   end

data/spec/models/application_spec.rb

@@ -1,9 +1,8 @@
-describe RestPack::Core::Service::Models::Application do
+describe Models::Core::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 { subject.class.table_name.should == 'restpack_applications' }
 
   context "default values" do
     it "has a random api_token" do

data/spec/models/domain_spec.rb

@@ -1,9 +1,8 @@
-describe RestPack::Core::Service::Models::Domain do
+describe Models::Core::Domain do
   it { should validate_presence_of(:identifier) }
   it { should validate_presence_of(:application_id) }
   it { should ensure_length_of(:identifier).is_at_most(512) }
   it { should belong_to(:application) }
-  it { subject.class.table_name.should == 'restpack_domains' }
 
   context "default values" do
     it "has a random session_secret" do
@@ -15,7 +14,7 @@ describe RestPack::Core::Service::Models::Domain do
     end
 
     it "has empty oauth_providers as default" do
-      create(:domain).oauth_providers.should == {}
+      create(:domain).oauth_providers.should == []
     end
 
     it "is not verified" do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rspec'
 require 'restpack_service/support/spec_helper'
 require 'restpack_core_service'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_core_service
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restpack_service
@@ -24,34 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: restpack_serializer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: restpack_gem
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -207,28 +151,40 @@ files:
 - README.md
 - Rakefile
 - config/database.yml
-- db/migrate/20130807103945_create_applications.rb
-- db/migrate/20130808135549_create_domains.rb
+- db/migrate/20130807103946_create_applications.rb
+- db/migrate/20130808135550_create_domains.rb
 - lib/restpack_core_service.rb
+- lib/restpack_core_service/commands/application/create.rb
+- lib/restpack_core_service/commands/application/get.rb
+- lib/restpack_core_service/commands/application/list.rb
+- lib/restpack_core_service/commands/application/verify_api_token.rb
+- lib/restpack_core_service/commands/domain/by_identifier.rb
+- lib/restpack_core_service/commands/domain/create.rb
+- lib/restpack_core_service/commands/domain/get.rb
+- lib/restpack_core_service/commands/domain/list.rb
+- lib/restpack_core_service/commands/domain/update.rb
 - lib/restpack_core_service/configuration.rb
 - lib/restpack_core_service/models/application.rb
 - lib/restpack_core_service/models/domain.rb
-- lib/restpack_core_service/serializers/application_serializer.rb
-- lib/restpack_core_service/serializers/domain_serializer.rb
-- lib/restpack_core_service/services.rb
-- lib/restpack_core_service/services/application/verify_api_token.rb
-- lib/restpack_core_service/services/domain/by_identifier.rb
-- lib/restpack_core_service/tasks.rb
+- lib/restpack_core_service/serializers/application.rb
+- lib/restpack_core_service/serializers/domain.rb
 - lib/restpack_core_service/tasks/db.rake
+- lib/restpack_core_service/tasks/tasks.rb
 - lib/restpack_core_service/version.rb
 - restpack_core_service.gemspec
+- spec/commands/application/create_spec.rb
+- spec/commands/application/get_spec.rb
+- spec/commands/application/list_spec.rb
+- spec/commands/application/verify_api_token_spec.rb
+- spec/commands/domain/by_identifier_spec.rb
+- spec/commands/domain/create_spec.rb
 - spec/configuration_spec.rb
+- spec/factories/api_application_factory.rb
+- spec/factories/api_domain_factory.rb
 - spec/factories/application_factory.rb
 - spec/factories/domain_factory.rb
 - spec/models/application_spec.rb
 - spec/models/domain_spec.rb
-- spec/services/application/verify_api_token_spec.rb
-- spec/services/domain/by_identifier_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/RestPack
 licenses:
@@ -255,11 +211,17 @@ signing_key:
 specification_version: 4
 summary: Applications, Domains and Configurations
 test_files:
+- spec/commands/application/create_spec.rb
+- spec/commands/application/get_spec.rb
+- spec/commands/application/list_spec.rb
+- spec/commands/application/verify_api_token_spec.rb
+- spec/commands/domain/by_identifier_spec.rb
+- spec/commands/domain/create_spec.rb
 - spec/configuration_spec.rb
+- spec/factories/api_application_factory.rb
+- spec/factories/api_domain_factory.rb
 - spec/factories/application_factory.rb
 - spec/factories/domain_factory.rb
 - spec/models/application_spec.rb
 - spec/models/domain_spec.rb
-- spec/services/application/verify_api_token_spec.rb
-- spec/services/domain/by_identifier_spec.rb
 - spec/spec_helper.rb

data/lib/restpack_core_service/serializers/application_serializer.rb

@@ -1,10 +0,0 @@
-module RestPack::Core::Service::Serializers
-  class ApplicationSerializer
-    include RestPack::Serializer
-
-    self.model_class = RestPack::Core::Service::Models::Application
-    self.key = :applications
-
-    attributes :id, :name, :account_id
-  end
-end

data/lib/restpack_core_service/serializers/domain_serializer.rb

@@ -1,13 +0,0 @@
-module RestPack::Core::Service::Serializers
-  class DomainSerializer
-    include RestPack::Serializer
-
-    self.model_class = RestPack::Core::Service::Models::Domain
-    self.key = :domains
-
-    attributes :id, :identifier, :application_id, :is_verified, :session_secret,
-               :oauth_providers
-
-    can_include :applications
-  end
-end

data/lib/restpack_core_service/services.rb

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