restpack_core_service 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2bee426ae4a23da2add15e79d02eeb7c4c0cc0a
-  data.tar.gz: f68631c3b3ce233431fa1e0691abce208c946e22
+  metadata.gz: 274fbf1cecbca4f5bedc1b02ae49fea9eb077492
+  data.tar.gz: 58e4777bf47d36144b57be6fa139c9d166422fff
 SHA512:
-  metadata.gz: 96ed4b9255544b9333a26498e0bfe5065056b53cff908637e6b7d662d59dce04b7bf2e9f4dae72cf4a786d9ed1ed821114afe6fc726b01fb843e0f2079cabd4a
-  data.tar.gz: 508c2670a7be016519b23039a89ee842ebd5faa16c5dec65e99e5ba2f944efe6e058aed768421aa3d163c9b4a0df724485fae375b22daf5da60a34571edf0491
+  metadata.gz: 1e71253fad5eb5ce4c381033945e594b04187e53cdc74d381a049e0f2c5af46a5317851e0c50912ded7e09483eeb4fd25a367ace6d46fc70bf531287a0424226
+  data.tar.gz: 5c2ffe4f2dce2fe189386b8b52d27dc5b0c8b9bc3c006fdcd3cda9c46d55abc3bc651a45f331b857f693eddf1d3220dce26593d1fd1533bcd706fddfa953fa88

data/db/migrate/20130807103945_create_applications.rb

@@ -1,10 +1,6 @@
 class CreateApplications < ActiveRecord::Migration
-  def table_name
-    RestPack::Core::Service.config.prefix_db_table(:applications)
-  end
-
   def change
-    create_table table_name do |t|
+    create_table :restpack_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_hosts.rb

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

data/db/migrate/20130808135613_create_domains.rb

@@ -1,10 +1,6 @@
 class CreateDomains < ActiveRecord::Migration
-  def table_name
-    RestPack::Core::Service.config.prefix_db_table(:domains)
-  end
-
   def change
-    create_table table_name do |t|
+    create_table :restpack_domains do |t|
       t.string :identifier, :null => false, :limit => 512
       t.integer :host_id, :null => false
 

data/lib/restpack_core_service/models/application.rb

@@ -1,6 +1,6 @@
 module RestPack::Core::Service::Models
-  class Application < Base
-    restpack_table_name :applications
+  class Application < ActiveRecord::Base
+    self.table_name = :restpack_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
-  class Domain < Base
-    restpack_table_name :domains
+  class Domain < ActiveRecord::Base
+    self.table_name = :restpack_domains
     attr_accessible :identifier, :host
 
     validates_presence_of :identifier

data/lib/restpack_core_service/models/host.rb

@@ -1,6 +1,6 @@
 module RestPack::Core::Service::Models
-  class Host < Base
-    restpack_table_name :hosts
+  class Host < ActiveRecord::Base
+    self.table_name = :restpack_hosts
     attr_accessible :name, :application_id, :session_secret, :oauth_providers
 
     validates_presence_of :name, :application_id

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

@@ -6,12 +6,16 @@ module RestPack::Core::Service::Commands::Application
     end
 
     def execute
-      application = Models::Application.find_by_id_and_api_token(
+      application = Core::Models::Application.find_by_id_and_api_token(
         inputs[:id],
         inputs[:api_token]
       )
 
-      status :forbidden if !application
+      if application
+        { id: application.id }
+      else
+        status :forbidden
+      end
     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 "db_table_prefix: #{RestPack::Core::Service.config.db_table_prefix}"
+      p "TODO"
     end
   end
 end

data/lib/restpack_core_service/version.rb

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

data/lib/restpack_core_service.rb

@@ -1,10 +1,10 @@
+require "active_record"
 require "restpack_service"
 require "active_support/core_ext"
 
 require "restpack_core_service/version"
 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"
@@ -12,6 +12,8 @@ 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
+module Core
+  Models = RestPack::Core::Service::Models
+  Commands = RestPack::Core::Service::Commands
+  # Serializers = RestPack::Core::Service::Serializers
+end

data/spec/configuration_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
 describe RestPack::Core::Service::Configuration do
-  it "has a default table prefix" do
-    RestPack::Core::Service.config.db_table_prefix.should == "restpack_"
-  end
+
 end

data/spec/factories/application_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :application, :class => Models::Application do
+  factory :application, :class => Core::Models::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 => Models::Domain do
+  factory :domain, :class => Core::Models::Domain do
     sequence(:identifier) {|n| "subdomain_#{n}.domain.com" }
     host
   end

data/spec/factories/host_factory.rb

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

data/spec/services/application/verify_api_token_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-describe Commands::Application::VerifyApiToken do
+describe Core::Commands::Application::VerifyApiToken do
   is_required :id, :api_token
 
   let(:response) { subject.class.run(params) }
@@ -17,7 +17,7 @@ describe Commands::Application::VerifyApiToken do
 
     it 'is valid' do
       response.success?.should == true
-      response.result.should == {}
+      response.result.should == { id: @application.id }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack_core_service
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Gavin Joyce
@@ -198,7 +198,6 @@ files:
 - 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

data/lib/restpack_core_service/models/base.rb

@@ -1,9 +0,0 @@
-module RestPack::Core::Service::Models
-  class Base < ActiveRecord::Base
-    self.abstract_class = true
-
-    def self.restpack_table_name(name)
-      self.table_name = RestPack::Core::Service.config.prefix_db_table(name)
-    end
-  end
-end