facemock 0.0.7 → 0.0.8

data/README.md

@@ -138,8 +138,8 @@ yaml file see below.
 
     require 'facemock'
 
-    app  = Facemock::Database::Application.create!
-    user = Facemock::Database::User.craete!(application_id: app.id)
+    app  = Facemock::Application.create!
+    user = Facemock::User.craete!(application_id: app.id)
     auth_hash = Facemock.auth_hash(user.access_token)
 
     # auth_hash == { "provider"    => "facebook", 

data/lib/facemock.rb

@@ -1,9 +1,13 @@
-require "facemock/version"
-require "facemock/config"
-require "facemock/fb_graph"
-require "facemock/database"
-require "facemock/errors"
-require "facemock/auth_hash"
+require 'facemock/version'
+require 'facemock/config'
+require 'facemock/fb_graph'
+require 'facemock/database'
+require 'facemock/errors'
+require 'facemock/auth_hash'
+require 'facemock/application'
+require 'facemock/user'
+require 'facemock/permission'
+require 'facemock/authorization_code'
 
 module Facemock 
   extend self
@@ -22,7 +26,7 @@ module Facemock
 
   def auth_hash(access_token=nil)
     if access_token.kind_of?(String) && access_token.size > 0
-      user = Facemock::Database::User.find_by_access_token(access_token)
+      user = Facemock::User.find_by_access_token(access_token)
       if user
         Facemock::AuthHash.new({
           provider:    "facebook",

data/lib/facemock/application.rb

@@ -0,0 +1,18 @@
+require 'facemock/database/table'
+require 'facemock/user'
+
+module Facemock
+  class Application < Database::Table
+    TABLE_NAME = :applications
+    COLUMN_NAMES = [:id, :secret, :created_at]
+    CHILDREN = [ User ]
+
+    # WANT : DBに登録済みの値と重複しないようにする(id, secret)
+    def initialize(options={})
+      opts = Hashie::Mash.new(options)
+      @id         = ( opts.id.to_i > 0 ) ? opts.id.to_i : (0..9).to_a.shuffle[0..15].join.to_i
+      @secret     = opts.secret || rand(36**32).to_s(36)
+      @created_at = opts.created_at
+    end
+  end
+end

data/lib/facemock/authorization_code.rb

@@ -0,0 +1,16 @@
+require 'facemock/database/table'
+
+module Facemock
+  class AuthorizationCode < Database::Table
+    TABLE_NAME = :authorization_codes
+    COLUMN_NAMES = [:id, :string, :user_id, :created_at]
+
+    def initialize(options={})
+      opts = Hashie::Mash.new(options)
+      @id         = opts.id
+      @string     = opts.string || rand(36**255).to_s(36)
+      @user_id    = opts.user_id
+      @created_at = opts.created_at
+    end
+  end
+end

data/lib/facemock/config.rb

@@ -38,9 +38,9 @@ module Facemock
         raise Facemock::Errors::IncorrectDataFormat.new "users format is incorrect" unless validate_users(users)
 
         # Create application and user record
-        app = Facemock::Database::Application.create!({ id: app_id, secret: app_secret })
+        app = Facemock::Application.create!({ id: app_id, secret: app_secret })
         users.each do |options|
-          user = Facemock::Database::User.new(options)
+          user = Facemock::User.new(options)
           user.application_id = app.id
           user.save!
         end

data/lib/facemock/database.rb

@@ -1,9 +1,5 @@
 require 'sqlite3'
 require 'facemock/database/table'
-require 'facemock/database/application'
-require 'facemock/database/user'
-require 'facemock/database/permission'
-require 'facemock/database/authorization_code'
 
 module Facemock
   class Database

data/lib/facemock/fb_graph.rb

@@ -2,6 +2,7 @@ require 'fb_graph'
 require 'facemock/config'
 require 'facemock/fb_graph/user'
 require 'facemock/fb_graph/application'
+require 'facemock/fb_graph/exception'
 
 module Facemock
   module FbGraph

data/lib/facemock/fb_graph/application.rb

@@ -2,7 +2,7 @@ require 'hashie'
 require 'facemock/config'
 require 'facemock/fb_graph/application/user'
 require 'facemock/fb_graph/application/test_users'
-require 'facemock/database/application'
+require 'facemock/application'
 
 module Facemock
   module FbGraph
@@ -30,7 +30,7 @@ module Facemock
           elsif !validate_identifier_and_secret
             raise Facemock::FbGraph::InvalidRequest.new "Unsupported get request."
           end
-          Facemock::Database::Application.find_by_id(@identifier)
+          Facemock::Application.find_by_id(@identifier)
         end
 
         if @record
@@ -65,8 +65,8 @@ module Facemock
       def validate_identifier_and_secret
         if validate_identifier && validate_secret
           # WANT : find_by_**_and_**(**, **)の実装
-          app_by_id     = Facemock::Database::Application.find_by_id(@identifier)
-          app_by_secret = Facemock::Database::Application.find_by_secret(@secret)
+          app_by_id     = Facemock::Application.find_by_id(@identifier)
+          app_by_secret = Facemock::Application.find_by_secret(@secret)
           !!(app_by_id && app_by_secret && app_by_id.identifier == app_by_secret.identifier)
         else
           false
@@ -76,23 +76,23 @@ module Facemock
       def validate_identifier
         return false if @identifier.nil? || @identifier == ""
         return false unless [Fixnum, String].include?(@identifier.class)
-        return false unless Facemock::Database::Application.find_by_id(@identifier)
+        return false unless Facemock::Application.find_by_id(@identifier)
         true
       end
 
       def validate_secret
         return false if @secret.nil? || @secret == ""
-        return false unless Facemock::Database::Application.find_by_secret(@secret)
+        return false unless Facemock::Application.find_by_secret(@secret)
         true
       end
 
       def validate_access_token
-        !!(Facemock::Database::User.find_by_access_token(@access_token))
+        !!(Facemock::User.find_by_access_token(@access_token))
       end
 
       def find_by_access_token
-        if user = Facemock::Database::User.find_by_access_token(@access_token)
-          Facemock::Database::Application.find_by_id(user.application_id)
+        if user = Facemock::User.find_by_access_token(@access_token)
+          Facemock::Application.find_by_id(user.application_id)
         else
           nil
         end

data/lib/facemock/fb_graph/application/user.rb

@@ -4,7 +4,7 @@ require 'facemock/fb_graph/application/user/permission'
 module Facemock
   module FbGraph
     class Application
-      class User < Facemock::Database::User
+      class User < Facemock::User
         attr_reader :permission_objects
 
         def initialize(options={})

data/lib/facemock/fb_graph/application/user/permission.rb

@@ -1,8 +1,11 @@
+require 'facemock/user'
+require 'facemock/permission'
+
 module Facemock
   module FbGraph
     class Application
-      class User < Facemock::Database::User
-        class Permission < Facemock::Database::Permission
+      class User < Facemock::User
+        class Permission < Facemock::Permission
         end
       end
     end

data/lib/facemock/fb_graph/exception.rb

@@ -0,0 +1,23 @@
+require 'fb_graph'
+
+module Facemock
+  module FbGraph
+    class Exception                < ::FbGraph::Exception; end
+    class BadRequest               < ::FbGraph::BadRequest; end
+    class Unauthorized             < ::FbGraph::Unauthorized; end
+    class NotFound                 < ::FbGraph::NotFound; end
+    class InternalServerError      < ::FbGraph::InternalServerError; end
+    class InvalidToken             < ::FbGraph::InvalidToken; end
+    class InvalidSession           < ::FbGraph::InvalidSession; end
+    class InvalidRequest           < ::FbGraph::InvalidRequest; end
+    class CreativeNotSaved         < ::FbGraph::CreativeNotSaved; end
+    class QueryLockTimeout         < ::FbGraph::QueryLockTimeout; end
+    class TargetingSpecNotSaved    < ::FbGraph::TargetingSpecNotSaved; end
+    class AdgroupFetchFailure      < ::FbGraph::AdgroupFetchFailure; end
+    class OpenProcessFailure       < ::FbGraph::OpenProcessFailure; end
+    class TransactionCommitFailure < ::FbGraph::TransactionCommitFailure; end
+    class QueryError               < ::FbGraph::QueryError; end
+    class QueryConnection          < ::FbGraph::QueryConnection; end
+    class QueryDuplicateKey        < ::FbGraph::QueryDuplicateKey; end
+  end
+end

data/lib/facemock/permission.rb

@@ -0,0 +1,16 @@
+require 'facemock/database/table'
+
+module Facemock
+  class Permission < Database::Table
+    TABLE_NAME = :permissions
+    COLUMN_NAMES = [:id, :name, :user_id, :created_at]
+
+    def initialize(options={})
+      opts = Hashie::Mash.new(options)
+      @id         = opts.id
+      @name       = opts.name
+      @user_id    = opts.user_id
+      @created_at = opts.created_at
+    end
+  end
+end

data/lib/facemock/user.rb

@@ -0,0 +1,24 @@
+require 'facemock/database/table'
+require 'facemock/permission'
+require 'facemock/authorization_code'
+
+module Facemock
+  class User < Database::Table
+    TABLE_NAME = :users
+    COLUMN_NAMES = [:id, :name, :email, :password, :installed, :access_token, :application_id, :created_at]
+    CHILDREN = [ Permission, AuthorizationCode ]
+
+    def initialize(options={})
+      opts = Hashie::Mash.new(options)
+      @id             = (opts.id.to_i > 0) ? opts.id.to_i : ("10000" + (0..9).to_a.shuffle[0..10].join).to_i
+      @name           = opts.name         || rand(36**10).to_s(36)
+      @email          = opts.email        || name.gsub(" ", "_") + "@example.com"
+      @password       = opts.password     || rand(36**10).to_s(36)
+      @installed      = opts.installed    || false
+      @access_token   = opts.access_token || Digest::SHA512.hexdigest(identifier.to_s)
+      app_id = opts.application_id.to_i
+      @application_id = (app_id > 0) ? app_id : nil
+      @created_at     = opts.created_at
+    end
+  end
+end

data/lib/facemock/version.rb

@@ -1,3 +1,3 @@
 module Facemock
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/facemock/{database/application_spec.rb → application_spec.rb}

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Facemock::Database::Application do
+describe Facemock::Application do
   include TableHelper
 
   let(:db_name)      { ".test" }
 
   let(:table_name)   { :applications }
   let(:column_names) { [ :id, :secret, :created_at ] }
-  let(:children)     { [ Facemock::Database::User ] }
+  let(:children)     { [ Facemock::User ] }
 
   let(:id)           { 1 }
   let(:secret)       { "test_secret" }
@@ -17,65 +17,65 @@ describe Facemock::Database::Application do
   after { remove_dynamically_defined_all_method }
 
   describe '::TABLE_NAME' do
-    subject { Facemock::Database::Application::TABLE_NAME }
+    subject { Facemock::Application::TABLE_NAME }
     it { is_expected.to eq table_name }
   end
 
   describe '::COLUMN_NAMES' do
-    subject { Facemock::Database::Application::COLUMN_NAMES }
+    subject { Facemock::Application::COLUMN_NAMES }
     it { is_expected.to eq column_names }
   end
 
   describe '::CHILDREN' do
-    subject { Facemock::Database::Application::CHILDREN }
+    subject { Facemock::Application::CHILDREN }
     it { is_expected.to eq children }
   end
 
   describe '#initialize' do
     context 'without option' do
-      subject { Facemock::Database::Application.new }
-      it { is_expected.to be_kind_of Facemock::Database::Application }
+      subject { Facemock::Application.new }
+      it { is_expected.to be_kind_of Facemock::Application }
 
       describe '.id' do
-        subject { Facemock::Database::Application.new.id }
+        subject { Facemock::Application.new.id }
         it { is_expected.to be > 0 }
       end
 
       describe '.secret' do
-        subject { Facemock::Database::Application.new.secret }
+        subject { Facemock::Application.new.secret }
         it { is_expected.to be_kind_of String }
 
         describe '.size' do
-          subject { Facemock::Database::Application.new.secret.size }
+          subject { Facemock::Application.new.secret.size }
           it { is_expected.to be <= 32 }
         end
       end
 
       describe '.created_at' do
-        subject { Facemock::Database::Application.new.created_at }
+        subject { Facemock::Application.new.created_at }
         it { is_expected.to be_nil }
       end
     end
 
     context 'with id option but it is not integer' do
       before { @opts = { id: "test_id" } }
-      subject { Facemock::Database::Application.new(@opts) }
-      it { is_expected.to be_kind_of Facemock::Database::Application }
+      subject { Facemock::Application.new(@opts) }
+      it { is_expected.to be_kind_of Facemock::Application }
 
       describe '.id' do
-        subject { Facemock::Database::Application.new(@opts).id }
+        subject { Facemock::Application.new(@opts).id }
         it { is_expected.to be > 0 }
       end
     end
 
     context 'with all options' do
-      subject { Facemock::Database::Application.new(options) }
-      it { is_expected.to be_kind_of Facemock::Database::Application }
+      subject { Facemock::Application.new(options) }
+      it { is_expected.to be_kind_of Facemock::Application }
 
       context 'then attributes' do
         it 'should set specified values by option' do
           column_names.each do |column_name|
-            value = Facemock::Database::Application.new(options).send(column_name)
+            value = Facemock::Application.new(options).send(column_name)
             expect(value).to eq options[column_name]
           end
         end
@@ -92,13 +92,13 @@ describe Facemock::Database::Application do
 
     context 'when has user' do
       before do
-        @application = Facemock::Database::Application.create!
-        Facemock::Database::User.create!(application_id: @application.id)
+        @application = Facemock::Application.create!
+        Facemock::User.create!(application_id: @application.id)
       end
 
       it 'should delete permissions' do
         @application.destroy
-        users = Facemock::Database::User.find_all_by_application_id(@application.id)
+        users = Facemock::User.find_all_by_application_id(@application.id)
         expect(users).to be_empty
       end
     end

data/spec/facemock/config_spec.rb

@@ -118,8 +118,8 @@ describe Facemock::Config do
           begin
             Facemock::Config.load_users(@path)
           rescue => error
-            expect(Facemock::Database::Application.all).to be_empty
-            expect(Facemock::Database::User.all).to be_empty
+            expect(Facemock::Application.all).to be_empty
+            expect(Facemock::User.all).to be_empty
           end
         end
       end
@@ -172,8 +172,8 @@ describe Facemock::Config do
           app_count  = yaml_load_data.size
           user_count = yaml_load_data.inject(0){|count, data| count += data[:users].size }
           Facemock::Config.load_users(@path)
-          expect(Facemock::Database::Application.all.count).to eq app_count
-          expect(Facemock::Database::User.all.count).to eq user_count
+          expect(Facemock::Application.all.count).to eq app_count
+          expect(Facemock::User.all.count).to eq user_count
         end
       end
     end

data/spec/facemock/database/authorization_code.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Facemock::Database::AuthorizationCode do
+describe Facemock::AuthorizationCode do
   include TableHelper
 
   let(:table_name)   { :authorization_codes }
@@ -16,29 +16,29 @@ describe Facemock::Database::AuthorizationCode do
   after { remove_dynamically_defined_all_method }
 
   describe '::TABLE_NAME' do
-    subject { Facemock::Database::AuthorizationCode::TABLE_NAME }
+    subject { Facemock::AuthorizationCode::TABLE_NAME }
     it { is_expected.to eq table_name }
   end
 
   describe '::COLUMN_NAMES' do
-    subject { Facemock::Database::AuthorizationCode::COLUMN_NAMES }
+    subject { Facemock::AuthorizationCode::COLUMN_NAMES }
     it { is_expected.to eq column_names }
   end
 
   describe '::CHILDREN' do
-    subject { Facemock::Database::AuthorizationCode::CHILDREN }
+    subject { Facemock::AuthorizationCode::CHILDREN }
     it { is_expected.to eq children }
   end
 
   describe '#initialize' do
     context 'without option' do
-      subject { Facemock::Database::AuthorizationCode.new }
-      it { is_expected.to be_kind_of Facemock::Database::AuthorizationCode }
+      subject { Facemock::AuthorizationCode.new }
+      it { is_expected.to be_kind_of Facemock::AuthorizationCode }
 
       context 'then attributes' do
         it 'should be nil except string' do
           column_names.each do |column_name|
-            value = Facemock::Database::AuthorizationCode.new.send(column_name)
+            value = Facemock::AuthorizationCode.new.send(column_name)
             if column_name == :string
               expect(value).not_to be_nil
             else
@@ -50,8 +50,8 @@ describe Facemock::Database::AuthorizationCode do
 
       context 'then string' do
         it 'should be random string' do
-          string1 = Facemock::Database::AuthorizationCode.new.string
-          string2 = Facemock::Database::AuthorizationCode.new.string
+          string1 = Facemock::AuthorizationCode.new.string
+          string2 = Facemock::AuthorizationCode.new.string
           expect(string1).to be_kind_of String
           expect(string1.size).to be < 256
           expect(string1).not_to eq string2
@@ -60,13 +60,13 @@ describe Facemock::Database::AuthorizationCode do
     end
 
     context 'with all options' do
-      subject { Facemock::Database::AuthorizationCode.new(options) }
-      it { is_expected.to be_kind_of Facemock::Database::AuthorizationCode }
+      subject { Facemock::AuthorizationCode.new(options) }
+      it { is_expected.to be_kind_of Facemock::AuthorizationCode }
 
       context 'then attributes' do
         it 'should set specified value by option' do
           column_names.each do |column_name|
-            value = Facemock::Database::AuthorizationCode.new(options).send(column_name)
+            value = Facemock::AuthorizationCode.new(options).send(column_name)
             expect(value).to eq options[column_name]
           end
         end

data/spec/facemock/fb_graph/application_spec.rb

@@ -16,7 +16,7 @@ describe Facemock::FbGraph::Application do
   after  { @database.drop }
 
   describe '#new' do
-    before { @default_record_size = Facemock::Database::Application.all.size }
+    before { @default_record_size = Facemock::Application.all.size }
 
     context 'without argument' do
       subject { lambda { Facemock::FbGraph::Application.new } }
@@ -29,7 +29,7 @@ describe Facemock::FbGraph::Application do
           expect(@app.identifier).to eq @id
           expect(@app.secret).to be_nil
           expect(@app.access_token).to be_nil
-          expect(Facemock::Database::Application.all.size).to eq @default_record_size
+          expect(Facemock::Application.all.size).to eq @default_record_size
         end
       end
 
@@ -57,7 +57,7 @@ describe Facemock::FbGraph::Application do
           expect(@app.identifier).to eq @id
           expect(@app.secret).to be_nil
           expect(@app.access_token).to be_nil
-          expect(Facemock::Database::Application.all.size).to eq @default_record_size
+          expect(Facemock::Application.all.size).to eq @default_record_size
         end
       end
 
@@ -71,7 +71,7 @@ describe Facemock::FbGraph::Application do
           expect(@app.identifier).to eq facebook_app_id
           expect(@app.secret).to eq @options[:secret]
           expect(@app.access_token).to eq @options[:access_token]
-          expect(Facemock::Database::Application.all.size).to eq @default_record_size
+          expect(Facemock::Application.all.size).to eq @default_record_size
         end
       end
     end

data/spec/facemock/fb_graph/exeption_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe Facemock::FbGraph::Exception do
+  describe 'Exception' do
+    subject { Facemock::FbGraph::Exception }
+    it { is_expected.not_to be_nil }
+  end
+end
+
+describe Facemock::FbGraph do
+  describe 'BadRequest' do
+    subject { Facemock::FbGraph::BadRequest.ancestors }
+    it { is_expected.to include ::FbGraph::BadRequest }
+  end
+
+  describe 'Unauthorized' do
+    subject { Facemock::FbGraph::Unauthorized.ancestors }
+    it { is_expected.to include ::FbGraph::Unauthorized }
+  end
+
+  describe 'NotFound' do
+    subject { Facemock::FbGraph::NotFound.ancestors }
+    it { is_expected.to include ::FbGraph::NotFound }
+  end
+
+  describe 'InternalServerError' do
+    subject { Facemock::FbGraph::InternalServerError.ancestors }
+    it { is_expected.to include ::FbGraph::InternalServerError }
+  end
+
+  describe 'InvalidToken' do
+    subject { Facemock::FbGraph::InvalidToken.ancestors }
+    it { is_expected.to include ::FbGraph::InvalidToken }
+  end
+
+  describe 'InvalidSession' do
+    subject { Facemock::FbGraph::InvalidSession.ancestors }
+    it { is_expected.to include ::FbGraph::InvalidSession }
+  end
+
+  describe 'InvalidRequest' do
+    subject { Facemock::FbGraph::InvalidRequest.ancestors }
+    it { is_expected.to include ::FbGraph::InvalidRequest }
+  end
+
+  describe 'CreativeNotSaved' do
+    subject { Facemock::FbGraph::CreativeNotSaved.ancestors }
+    it { is_expected.to include ::FbGraph::CreativeNotSaved }
+  end
+
+  describe 'QueryLockTimeout' do
+    subject { Facemock::FbGraph::QueryLockTimeout.ancestors }
+    it { is_expected.to include ::FbGraph::QueryLockTimeout }
+  end
+
+  describe 'TargetingSpecNotSaved' do
+    subject { Facemock::FbGraph::TargetingSpecNotSaved.ancestors }
+    it { is_expected.to include ::FbGraph::TargetingSpecNotSaved }
+  end
+
+  describe 'AdgroupFetchFailure' do
+    subject { Facemock::FbGraph::AdgroupFetchFailure.ancestors }
+    it { is_expected.to include ::FbGraph::AdgroupFetchFailure }
+  end
+
+  describe 'OpenProcessFailure' do
+    subject { Facemock::FbGraph::OpenProcessFailure.ancestors }
+    it { is_expected.to include ::FbGraph::OpenProcessFailure }
+  end
+
+  describe 'TransactionCommitFailure' do
+    subject { Facemock::FbGraph::TransactionCommitFailure.ancestors }
+    it { is_expected.to include ::FbGraph::TransactionCommitFailure }
+  end
+
+  describe 'QueryError' do
+    subject { Facemock::FbGraph::QueryError.ancestors }
+    it { is_expected.to include ::FbGraph::QueryError }
+  end
+
+  describe 'QueryConnection' do
+    subject { Facemock::FbGraph::QueryConnection.ancestors }
+    it { is_expected.to include ::FbGraph::QueryConnection }
+  end
+
+  describe 'QueryDupulicateKey' do
+    subject { Facemock::FbGraph::QueryDuplicateKey.ancestors }
+    it { is_expected.to include ::FbGraph::QueryDuplicateKey }
+  end
+end

data/spec/facemock/{database/permission_spec.rb → permission_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Facemock::Database::Permission do
+describe Facemock::Permission do
   include TableHelper
 
   let(:table_name)   { :permissions }
@@ -16,29 +16,29 @@ describe Facemock::Database::Permission do
   after { remove_dynamically_defined_all_method }
 
   describe '::TABLE_NAME' do
-    subject { Facemock::Database::Permission::TABLE_NAME }
+    subject { Facemock::Permission::TABLE_NAME }
     it { is_expected.to eq table_name }
   end
 
   describe '::COLUMN_NAMES' do
-    subject { Facemock::Database::Permission::COLUMN_NAMES }
+    subject { Facemock::Permission::COLUMN_NAMES }
     it { is_expected.to eq column_names }
   end
 
   describe '::CHILDREN' do
-    subject { Facemock::Database::Permission::CHILDREN }
+    subject { Facemock::Permission::CHILDREN }
     it { is_expected.to eq children }
   end
 
   describe '#initialize' do
     context 'without option' do
-      subject { Facemock::Database::Permission.new }
-      it { is_expected.to be_kind_of Facemock::Database::Permission }
+      subject { Facemock::Permission.new }
+      it { is_expected.to be_kind_of Facemock::Permission }
 
       context 'then attributes' do
         it 'should be nil' do
           column_names.each do |column_name|
-            value = Facemock::Database::Permission.new.send(column_name)
+            value = Facemock::Permission.new.send(column_name)
             expect(value).to be_nil
           end
         end
@@ -46,13 +46,13 @@ describe Facemock::Database::Permission do
     end
 
     context 'with all options' do
-      subject { Facemock::Database::Permission.new(options) }
-      it { is_expected.to be_kind_of Facemock::Database::Permission }
+      subject { Facemock::Permission.new(options) }
+      it { is_expected.to be_kind_of Facemock::Permission }
 
       context 'then attributes' do
         it 'should set specified value by option' do
           column_names.each do |column_name|
-            value = Facemock::Database::Permission.new(options).send(column_name)
+            value = Facemock::Permission.new(options).send(column_name)
             expect(value).to eq options[column_name]
           end
         end

data/spec/facemock/{database/user_spec.rb → user_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Facemock::Database::User do
+describe Facemock::User do
   include TableHelper
 
   let(:db_name)        { ".test" }
@@ -13,8 +13,8 @@ describe Facemock::Database::User do
                            :access_token,
                            :application_id,
                            :created_at ] }
-  let(:children)       { [ Facemock::Database::Permission, 
-                           Facemock::Database::AuthorizationCode ] }
+  let(:children)       { [ Facemock::Permission, 
+                           Facemock::AuthorizationCode ] }
 
   let(:id)             { 1 }
   let(:name)           { "test user" }
@@ -36,91 +36,91 @@ describe Facemock::Database::User do
   after { remove_dynamically_defined_all_method }
 
   describe '::TABLE_NAME' do
-    subject { Facemock::Database::User::TABLE_NAME }
+    subject { Facemock::User::TABLE_NAME }
     it { is_expected.to eq table_name }
   end
 
   describe '::COLUMN_NAMES' do
-    subject { Facemock::Database::User::COLUMN_NAMES }
+    subject { Facemock::User::COLUMN_NAMES }
     it { is_expected.to eq column_names }
   end
 
   describe '::CHILDREN' do
-    subject { Facemock::Database::User::CHILDREN }
+    subject { Facemock::User::CHILDREN }
     it { is_expected.to eq children }
   end
 
   describe '#initialize' do
     context 'without option' do
-      subject { Facemock::Database::User.new }
-      it { is_expected.to be_kind_of Facemock::Database::User }
+      subject { Facemock::User.new }
+      it { is_expected.to be_kind_of Facemock::User }
 
       describe '.id' do
-        subject { Facemock::Database::User.new.id }
+        subject { Facemock::User.new.id }
         it { is_expected.to be > 0 }
         it { is_expected.to be < 100010000000000 }
       end
 
       describe '.name' do
-        subject { Facemock::Database::User.new.name }
+        subject { Facemock::User.new.name }
         it { is_expected.to be_kind_of String }
 
         describe '.size' do
-          subject { Facemock::Database::User.new.name.size }
+          subject { Facemock::User.new.name.size }
           it { is_expected.to be <= 10 }
         end
       end
 
       describe '.email' do
-        before { @user = Facemock::Database::User.new }
+        before { @user = Facemock::User.new }
         subject { @user.email }
         it { is_expected.to be_kind_of String }
         it { is_expected.to eq "#{@user.name}@example.com" }
       end
 
       describe '.password' do
-        subject { Facemock::Database::User.new.password }
+        subject { Facemock::User.new.password }
         it { is_expected.to be_kind_of String }
 
         describe '.size' do
-          subject { Facemock::Database::User.new.password.size }
+          subject { Facemock::User.new.password.size }
           it { is_expected.to be <= 10 }
         end
       end
 
       describe '.installed' do
-        subject { Facemock::Database::User.new.installed }
+        subject { Facemock::User.new.installed }
         it { is_expected.to eq false }
       end
 
       describe '.access_token' do
-        subject { Facemock::Database::User.new.access_token }
+        subject { Facemock::User.new.access_token }
         it { is_expected.to be_kind_of String }
 
         describe '.size' do
-          subject { Facemock::Database::User.new.access_token.size }
+          subject { Facemock::User.new.access_token.size }
           it { is_expected.to eq 128 }
         end
       end
 
       describe '.application_id' do
-        subject { Facemock::Database::User.new.application_id }
+        subject { Facemock::User.new.application_id }
         it { is_expected.to be_nil }
       end
 
       describe '.created_at' do
-        subject { Facemock::Database::User.new.created_at }
+        subject { Facemock::User.new.created_at }
         it { is_expected.to be_nil }
       end
     end
 
     context 'with id option but it is not integer' do
       before { @opts = { id: "test_id" } }
-      subject { Facemock::Database::User.new(@opts) }
-      it { is_expected.to be_kind_of Facemock::Database::User }
+      subject { Facemock::User.new(@opts) }
+      it { is_expected.to be_kind_of Facemock::User }
 
       describe '.id' do
-        subject { Facemock::Database::User.new(@opts).id }
+        subject { Facemock::User.new(@opts).id }
         it { is_expected.to be > 0 }
         it { is_expected.to be < 100010000000000 }
       end
@@ -128,11 +128,11 @@ describe Facemock::Database::User do
 
     context 'with application_id option but it is not integer' do
       before { @opts = { application_id: "test_id" } }
-      subject { Facemock::Database::User.new(@opts) }
-      it { is_expected.to be_kind_of Facemock::Database::User }
+      subject { Facemock::User.new(@opts) }
+      it { is_expected.to be_kind_of Facemock::User }
 
       describe '.application_id' do
-        subject { Facemock::Database::User.new(@opts).application_id }
+        subject { Facemock::User.new(@opts).application_id }
         it { is_expected.to be_nil }
       end
     end
@@ -142,28 +142,28 @@ describe Facemock::Database::User do
         @name = "test user"
         @opts = { name: @name }
       end
-      subject { Facemock::Database::User.new(@opts) }
-      it { is_expected.to be_kind_of Facemock::Database::User }
+      subject { Facemock::User.new(@opts) }
+      it { is_expected.to be_kind_of Facemock::User }
 
       context '.name' do
-        subject { Facemock::Database::User.new(@opts).name }
+        subject { Facemock::User.new(@opts).name }
         it { is_expected.to eq @name }
       end
 
       context '.email' do
-        subject { Facemock::Database::User.new(@opts).email }
+        subject { Facemock::User.new(@opts).email }
         it { is_expected.to eq @name.gsub(" ", "_") + "@example.com" }
       end
     end
 
     context 'with all options' do
-      subject { Facemock::Database::User.new(options) }
-      it { is_expected.to be_kind_of Facemock::Database::User }
+      subject { Facemock::User.new(options) }
+      it { is_expected.to be_kind_of Facemock::User }
 
       context 'then attributes' do
         it 'should set specified value by option' do
           column_names.each do |column_name|
-            value = Facemock::Database::User.new(options).send(column_name)
+            value = Facemock::User.new(options).send(column_name)
             expect(value).to eq options[column_name]
           end
         end
@@ -180,19 +180,19 @@ describe Facemock::Database::User do
 
     context 'when has permission and authorizaion_code' do
       before do
-        application = Facemock::Database::Application.create!
-        @user = Facemock::Database::User.create!(application_id: application.id)
-        permission = Facemock::Database::Permission.new(name: "email", user_id: @user.id)
+        application = Facemock::Application.create!
+        @user = Facemock::User.create!(application_id: application.id)
+        permission = Facemock::Permission.new(name: "email", user_id: @user.id)
         permission.save!
-        authorization_code = Facemock::Database::AuthorizationCode.new(user_id: @user.id)
+        authorization_code = Facemock::AuthorizationCode.new(user_id: @user.id)
         authorization_code.save!
       end
 
       it 'should delete permissions' do
         @user.destroy
-        permissions = Facemock::Database::Permission.find_all_by_user_id(@user.id)
+        permissions = Facemock::Permission.find_all_by_user_id(@user.id)
         expect(permissions).to be_empty
-        authorization_codes = Facemock::Database::AuthorizationCode.find_all_by_user_id(@user.id)
+        authorization_codes = Facemock::AuthorizationCode.find_all_by_user_id(@user.id)
         expect(authorization_codes).to be_empty
       end
     end

data/spec/facemock_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Facemock do
-  let(:version) { '0.0.7' }
+  let(:version) { '0.0.8' }
   let(:db_name) { '.test' }
 
   describe 'VERSION' do
@@ -77,8 +77,8 @@ describe Facemock do
       before do
         stub_const("Facemock::Database::DEFAULT_DB_NAME", db_name)
         @database = Facemock::Database.new
-        application = Facemock::Database::Application.create!
-        @user = Facemock::Database::User.create!(application_id: application.id)
+        application = Facemock::Application.create!
+        @user = Facemock::User.create!(application_id: application.id)
         @access_token = @user.access_token
       end
       after { @database.drop }

data/spec/support/application_create_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationCreateHelper
   def create_application(options={})
-    Facemock::Database::Application.create!(options)
+    Facemock::Application.create!(options)
   end
 end

data/spec/support/tables_helper.rb

@@ -1,10 +1,10 @@
 module TableHelper
   def remove_dynamically_defined_all_method
     klasses = [Facemock::Database::Table,
-               Facemock::Database::Application,
-               Facemock::Database::User,
-               Facemock::Database::Permission,
-               Facemock::Database::AuthorizationCode ]
+               Facemock::Application,
+               Facemock::User,
+               Facemock::Permission,
+               Facemock::AuthorizationCode ]
     klasses.each do |klass|
       remove_dynamically_defined_class_method(klass)
       remove_dynamically_defined_instance_method(klass)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facemock
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -190,36 +190,38 @@ files:
 - db/.gitkeep
 - facemock.gemspec
 - lib/facemock.rb
+- lib/facemock/application.rb
 - lib/facemock/auth_hash.rb
+- lib/facemock/authorization_code.rb
 - lib/facemock/config.rb
 - lib/facemock/database.rb
-- lib/facemock/database/application.rb
-- lib/facemock/database/authorization_code.rb
-- lib/facemock/database/permission.rb
 - lib/facemock/database/table.rb
-- lib/facemock/database/user.rb
 - lib/facemock/errors.rb
 - lib/facemock/fb_graph.rb
 - lib/facemock/fb_graph/application.rb
 - lib/facemock/fb_graph/application/test_users.rb
 - lib/facemock/fb_graph/application/user.rb
 - lib/facemock/fb_graph/application/user/permission.rb
+- lib/facemock/fb_graph/exception.rb
 - lib/facemock/fb_graph/user.rb
+- lib/facemock/permission.rb
+- lib/facemock/user.rb
 - lib/facemock/version.rb
+- spec/facemock/application_spec.rb
 - spec/facemock/auth_hash_spec.rb
 - spec/facemock/config_spec.rb
-- spec/facemock/database/application_spec.rb
 - spec/facemock/database/authorization_code.rb
-- spec/facemock/database/permission_spec.rb
 - spec/facemock/database/table_spec.rb
-- spec/facemock/database/user_spec.rb
 - spec/facemock/database_spec.rb
 - spec/facemock/errors_spec.rb
 - spec/facemock/fb_graph/application/test_users_spec.rb
 - spec/facemock/fb_graph/application/user_spec.rb
 - spec/facemock/fb_graph/application_spec.rb
+- spec/facemock/fb_graph/exeption_spec.rb
 - spec/facemock/fb_graph/user_spec.rb
 - spec/facemock/fb_graph_spec.rb
+- spec/facemock/permission_spec.rb
+- spec/facemock/user_spec.rb
 - spec/facemock_spec.rb
 - spec/spec_helper.rb
 - spec/support/application_create_helper.rb
@@ -239,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2537604812428127045
+      hash: 1294869249957825564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2537604812428127045
+      hash: 1294869249957825564
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -256,20 +258,21 @@ signing_key:
 specification_version: 3
 summary: This is facebook mock application for fb_graph.
 test_files:
+- spec/facemock/application_spec.rb
 - spec/facemock/auth_hash_spec.rb
 - spec/facemock/config_spec.rb
-- spec/facemock/database/application_spec.rb
 - spec/facemock/database/authorization_code.rb
-- spec/facemock/database/permission_spec.rb
 - spec/facemock/database/table_spec.rb
-- spec/facemock/database/user_spec.rb
 - spec/facemock/database_spec.rb
 - spec/facemock/errors_spec.rb
 - spec/facemock/fb_graph/application/test_users_spec.rb
 - spec/facemock/fb_graph/application/user_spec.rb
 - spec/facemock/fb_graph/application_spec.rb
+- spec/facemock/fb_graph/exeption_spec.rb
 - spec/facemock/fb_graph/user_spec.rb
 - spec/facemock/fb_graph_spec.rb
+- spec/facemock/permission_spec.rb
+- spec/facemock/user_spec.rb
 - spec/facemock_spec.rb
 - spec/spec_helper.rb
 - spec/support/application_create_helper.rb

data/lib/facemock/database/application.rb

@@ -1,20 +0,0 @@
-require 'facemock/database/table'
-require 'facemock/database/user'
-
-module Facemock
-  class Database
-    class Application < Table
-      TABLE_NAME = :applications
-      COLUMN_NAMES = [:id, :secret, :created_at]
-      CHILDREN = [ User ]
-
-      # WANT : DBに登録済みの値と重複しないようにする(id, secret)
-      def initialize(options={})
-        opts = Hashie::Mash.new(options)
-        @id         = ( opts.id.to_i > 0 ) ? opts.id.to_i : (0..9).to_a.shuffle[0..15].join.to_i
-        @secret     = opts.secret || rand(36**32).to_s(36)
-        @created_at = opts.created_at
-      end
-    end
-  end
-end

data/lib/facemock/database/authorization_code.rb

@@ -1,18 +0,0 @@
-require 'facemock/database/table'
-
-module Facemock
-  class Database
-    class AuthorizationCode < Table
-      TABLE_NAME = :authorization_codes
-      COLUMN_NAMES = [:id, :string, :user_id, :created_at]
-
-      def initialize(options={})
-        opts = Hashie::Mash.new(options)
-        @id         = opts.id
-        @string     = opts.string || rand(36**255).to_s(36)
-        @user_id    = opts.user_id
-        @created_at = opts.created_at
-      end
-    end
-  end
-end

data/lib/facemock/database/permission.rb

@@ -1,18 +0,0 @@
-require 'facemock/database/table'
-
-module Facemock
-  class Database
-    class Permission < Table
-      TABLE_NAME = :permissions
-      COLUMN_NAMES = [:id, :name, :user_id, :created_at]
-
-      def initialize(options={})
-        opts = Hashie::Mash.new(options)
-        @id         = opts.id
-        @name       = opts.name
-        @user_id    = opts.user_id
-        @created_at = opts.created_at
-      end
-    end
-  end
-end

data/lib/facemock/database/user.rb

@@ -1,26 +0,0 @@
-require 'facemock/database/table'
-require 'facemock/database/permission'
-require 'facemock/database/authorization_code'
-
-module Facemock
-  class Database
-    class User < Table
-      TABLE_NAME = :users
-      COLUMN_NAMES = [:id, :name, :email, :password, :installed, :access_token, :application_id, :created_at]
-      CHILDREN = [ Permission, AuthorizationCode ]
-
-      def initialize(options={})
-        opts = Hashie::Mash.new(options)
-        @id             = (opts.id.to_i > 0) ? opts.id.to_i : ("10000" + (0..9).to_a.shuffle[0..10].join).to_i
-        @name           = opts.name         || rand(36**10).to_s(36)
-        @email          = opts.email        || name.gsub(" ", "_") + "@example.com"
-        @password       = opts.password     || rand(36**10).to_s(36)
-        @installed      = opts.installed    || false
-        @access_token   = opts.access_token || Digest::SHA512.hexdigest(identifier.to_s)
-        app_id = opts.application_id.to_i
-        @application_id = (app_id > 0) ? app_id : nil
-        @created_at     = opts.created_at
-      end
-    end
-  end
-end