facemock 0.0.5 → 0.0.6

data/lib/facemock/config.rb

@@ -38,7 +38,7 @@ module Facemock
         raise Facemock::Errors::IncorrectDataFormat.new "users format is incorrect" unless validate_users(users)
 
         # Create application and user record
-        self.database if @db
+        Facemock::Database::Application.new({ id: app_id, secret: app_secret }).save!
         app = Facemock::FbGraph::Application.new(app_id, secret: app_secret)
         users.each do |options|
           app.test_user!(options)

data/lib/facemock/database/application.rb

@@ -9,10 +9,11 @@ module Facemock
       TABLE_NAME = :applications
       COLUMN_NAMES = [:id, :secret, :created_at]
 
+      # 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  || Digest::SHA512.hexdigest(identifier.to_s)
+        @secret     = opts.secret || rand(36**32).to_s(36)
         @created_at = opts.created_at
       end
     end

data/lib/facemock/database/table.rb

@@ -209,6 +209,8 @@ module Facemock
       def self.define_find_by_column(column_name)
         self.class_eval <<-EOF
           def self.find_by_#{column_name}(value)
+            return nil if value.nil?
+
             column_value = case value
             when String then "'" + value + "'"
             when Time   then "'" + value.to_s + "'"
@@ -227,6 +229,8 @@ module Facemock
       def self.define_find_all_by_column(column_name)
         self.class_eval <<-EOF
           def self.find_all_by_#{column_name}(value)
+            return [] if value.nil?
+
             column_value = case value
             when String then "'" + value + "'"
             when Time   then "'" + value.to_s + "'"

data/lib/facemock/fb_graph/application.rb

@@ -7,33 +7,42 @@ require 'facemock/database/application'
 module Facemock
   module FbGraph
     class Application
-      attr_reader :identifier
-      attr_reader :secret
+      attr_accessor :identifier
+      attr_accessor :secret
+      attr_accessor :access_token  # user access token
 
       def initialize(identifier, options={})
         opts = Hashie::Mash.new(options)
-        if (identifier == :app && opts.access_token)
-          identifier = (0..9).to_a.shuffle[0..15].join
-          secret = opts.access_token
-        else
-          secret = opts.secret || rand(36**32).to_s(36)
-        end
-
-        @record = Facemock::Database::Application.new({id: identifier, secret: secret})
-        @record.save! unless Facemock::Database::Application.find_by_id(identifier)
-        @identifier = identifier.to_i
-        @secret     = secret
+        @identifier   = identifier
+        @secret       = opts.secret
+        @access_token = opts.access_token
       end
 
       def fetch
-        if @record = Facemock::Database::Application.find_by_id(@identifier)
-          @identifier = @record.id
-          @secret     = @record.secret
+        @record = if @identifier == :app
+          unless validate_access_token
+            raise Facemock::FbGraph::InvalidToken.new "Invalid OAuth access token."
+          end
+          find_by_access_token
+        else
+          if @access_token && !validate_access_token
+            raise Facemock::FbGraph::InvalidToken.new "Invalid OAuth access token."
+          elsif !validate_identifier_and_secret
+            raise Facemock::FbGraph::InvalidRequest.new "Unsupported get request."
+          end
+          Facemock::Database::Application.find_by_id(@identifier)
+        end
+
+        if @record
+          @identifier   = @record.id
+          @secret       = @record.secret
+          @access_token = nil
         end
         self
       end
 
       def test_user!(options={})
+        validate_and_raise_error
         options.merge!({application_id: self.identifier})
         user = User.new(options)
         user.save!
@@ -41,8 +50,55 @@ module Facemock
       end
 
       def test_users(options={})
+        validate_and_raise_error
         TestUsers.new(self.identifier, options)
       end
+
+      private
+
+      def validate_and_raise_error()
+        if @access_token && !validate_access_token
+          raise Facemock::FbGraph::InvalidToken.new "Invalid OAuth access token."
+        elsif !validate_identifier_and_secret
+          raise Facemock::FbGraph::InvalidRequest.new "Unsupported get request."
+        end
+      end
+
+      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 && app_by_secret && app_by_id.identifier == app_by_secret.identifier)
+        else
+          false
+        end
+      end
+
+      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)
+        true
+      end
+
+      def validate_secret
+        return false if @secret.nil? || @secret == ""
+        return false unless Facemock::Database::Application.find_by_secret(@secret)
+        true
+      end
+
+      def validate_access_token
+        !!(Facemock::Database::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)
+        else
+          nil
+        end
+      end
     end
   end
 end

data/lib/facemock/fb_graph.rb

@@ -26,5 +26,6 @@ module Facemock
     end
 
     class InvalidToken < ::FbGraph::InvalidToken; end
+    class InvalidRequest < ::FbGraph::InvalidRequest; end
   end
 end

data/lib/facemock/version.rb

@@ -1,3 +1,3 @@
 module Facemock
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/facemock/database/application_spec.rb

@@ -35,7 +35,7 @@ describe Facemock::Database::Application do
 
         describe '.size' do
           subject { Facemock::Database::Application.new.secret.size }
-          it { is_expected.to eq 128 }
+          it { is_expected.to be <= 32 }
         end
       end
 

data/spec/facemock/database/tables_spec.rb

@@ -451,6 +451,11 @@ describe Facemock::Database::Table do
       end
 
       describe '.find_by_id' do
+        context 'with nil' do
+          subject { Facemock::Database::Table.find_by_id(nil) }
+          it { is_expected.to be_nil }
+        end
+
         context 'with not id' do
           subject { Facemock::Database::Table.find_by_id("hoge") }
           it { is_expected.to be_nil }
@@ -512,6 +517,11 @@ describe Facemock::Database::Table do
       end
 
       describe '.find_all_by_id' do
+        context 'with nil' do
+          subject { Facemock::Database::Table.find_all_by_id(nil) }
+          it { is_expected.to be_empty }
+        end
+
         context 'with not id' do
           subject { Facemock::Database::Table.find_all_by_id("hoge") }
           it { is_expected.to be_empty }

data/spec/facemock/database/user_spec.rb

@@ -80,7 +80,7 @@ describe Facemock::Database::User do
 
         describe '.size' do
           subject { Facemock::Database::User.new.password.size }
-          it { is_expected.to eq 10 }
+          it { is_expected.to be <= 10 }
         end
       end
 

data/spec/facemock/fb_graph/application/test_users_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Facemock::FbGraph::Application::TestUsers do
+  include ApplicationCreateHelper
+
   let(:db_name)         { ".test" }
 
   let(:facebook_app_id) { "100000000000000" }
@@ -133,6 +135,7 @@ describe Facemock::FbGraph::Application::TestUsers do
 
   describe '#next' do
     before do
+      create_application({ id: facebook_app_id, secret: "test_secret" })
       @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: "test_secret")
       3.times { @app.test_user! }
     end

data/spec/facemock/fb_graph/application_spec.rb

@@ -1,12 +1,20 @@
 require 'spec_helper'
 
 describe Facemock::FbGraph::Application do
+  include ApplicationCreateHelper
+
   let(:db_name)      { ".test" }
 
   let(:facebook_app_id) { 100000000000000 }
   let(:facebook_app_secret) { "test_secret" }
   let(:access_token) { "access_token" }
 
+  before do
+    stub_const("Facemock::Database::DEFAULT_DB_NAME", db_name)
+    @database = Facemock::Database.new
+  end
+  after  { @database.drop }
+
   it 'should have a user class' do
     expect(Facemock::FbGraph::Application::User).to be_truthy
     expect(Facemock::FbGraph::Application::User.ancestors).to include Facemock::Database::User
@@ -17,115 +25,270 @@ describe Facemock::FbGraph::Application do
     expect(Facemock::FbGraph::Application::TestUsers.ancestors).to include Array
   end
 
-  before do
-    stub_const("Facemock::Database::DEFAULT_DB_NAME", db_name)
-    @database = Facemock::Database.new
-  end
-  after  { @database.drop }
-
   describe '#new' do
+    before { @default_record_size = Facemock::Database::Application.all.size }
+
     context 'without argument' do
       subject { lambda { Facemock::FbGraph::Application.new } }
       it { is_expected.to raise_error ArgumentError }
     end
 
-    context 'with facebook app id and secret' do
-      before { @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret) }
+    context 'with facebook app id' do
+      shared_context 'new is success and record creates', assert: :attributes_and_created_record do
+        it 'should set only identifier specified value by argument and record create' 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
+        end
+      end
+
+      context 'when facebook app id is integer', assert: :attributes_and_created_record do
+        before do
+          @id  = facebook_app_id
+          @app = Facemock::FbGraph::Application.new(facebook_app_id)
+        end
+      end
 
-      describe '.identifier' do
-        subject { @app.identifier }
-        it { is_expected.to eq facebook_app_id }
+      context 'when facebook app id is numerical string', assert: :attributes_and_created_record do
+        before do
+          @id = facebook_app_id.to_s
+          @app = Facemock::FbGraph::Application.new(@id)
+        end
       end
 
-      describe '.secreet' do
-        subject { @app.secret }
-        it { is_expected.to eq facebook_app_secret }
+      context 'when facebook app id is :app' do
+        before do
+          @id = :app
+          @app = Facemock::FbGraph::Application.new(@id)
+        end
+
+        it 'should set only identifier specified value by argument and record does not create' 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
+        end
+      end
+
+      context 'and all options' do
+        before do
+          @options = { secret: facebook_app_secret, access_token: access_token }
+          @app = Facemock::FbGraph::Application.new(facebook_app_id, @options)
+        end
+
+        it 'should set all attributes specified value by argument' 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
+        end
       end
     end
+  end
 
-    context 'with facebook app id and secret' do
-      before do
-        options = { secret: facebook_app_secret }
-        @app = Facemock::FbGraph::Application.new(facebook_app_id, options)
+  describe '#fetch' do
+    context 'when instance identifier is nil' do
+      before { @app = Facemock::FbGraph::Application.new(nil) }
+      subject { lambda { @app.fetch } }
+      it { is_expected.to raise_error Facemock::FbGraph::InvalidRequest }
+    end
+
+    context 'when instance identifier is empty string' do
+      before { @app = Facemock::FbGraph::Application.new("") }
+      subject { lambda { @app.fetch } }
+      it { is_expected.to raise_error Facemock::FbGraph::InvalidRequest }
+    end
+
+    context 'when instance identifier is integer' do
+      context 'and secret is not specified' do
+        before { @app = Facemock::FbGraph::Application.new(facebook_app_id) }
+        subject { lambda { @app.fetch } }
+        it { is_expected.to raise_error Facemock::FbGraph::InvalidRequest }
       end
 
-      describe '.identifier' do
-        subject { @app.identifier }
-        it { is_expected.to eq facebook_app_id }
+      context 'and incorrect secret is specified' do
+        before do
+          Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+          @app = Facemock::FbGraph::Application.new(facebook_app_id)
+          @app.secret = "incorrect_secret"
+        end
+        subject { lambda { @app.fetch } }
+        it { is_expected.to raise_error Facemock::FbGraph::InvalidRequest }
       end
 
-      describe '.secreet' do
-        subject { @app.secret }
-        it { is_expected.to eq facebook_app_secret }
+      context 'and the other application secret is specified' do
+        before do
+          secret = "other_secret"
+          app  = Facemock::FbGraph::Application.new(facebook_app_id,     secret: facebook_app_secret)
+          app  = Facemock::FbGraph::Application.new(facebook_app_id + 1, secret: secret)
+          @app = Facemock::FbGraph::Application.new(facebook_app_id,     secret: secret)
+        end
+        subject { lambda { @app.fetch } }
+        it { is_expected.to raise_error Facemock::FbGraph::InvalidRequest }
+      end
+
+      context 'and correct secret is specified' do
+        before do
+          create_application({ id: facebook_app_id, secret: facebook_app_secret })
+          @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+        end
+
+        subject { @app.fetch }
+        it { is_expected.to be_kind_of Facemock::FbGraph::Application }
+
+        it 'should not change identifier and secret' do
+          identifier = @app.identifier
+          secret     = @app.secret
+          @app.fetch
+          expect(@app.identifier).to eq identifier
+          expect(@app.secret).to eq secret
+          expect(@app.access_token).to be_nil
+        end
+
+        context 'and incorrect access_token is specified' do
+          before do
+            @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+            @app.access_token = "incorrect_token"
+          end
+          subject { lambda { @app.fetch } }
+          it { is_expected.to raise_error Facemock::FbGraph::InvalidToken }
+        end
       end
     end
 
-    context 'with app symbole and access_token' do
-      before { @app = Facemock::FbGraph::Application.new(:app, access_token: access_token) }
+    context 'when instance identifier is :app' do
+      context 'and access token is not specified' do
+        before { @app = Facemock::FbGraph::Application.new(:app) }
+        subject { lambda { @app.fetch } }
+        it { is_expected.to raise_error Facemock::FbGraph::InvalidToken }
+      end
 
-      describe '.identifier' do
-        subject { @app.identifier }
-        it { is_expected.to be_kind_of Integer }
+      context 'and access token is incorrect' do
+        before { @app = Facemock::FbGraph::Application.new(:app, access_token: "incorrect_token") }
+        subject { lambda { @app.fetch } }
+        it { is_expected.to raise_error Facemock::FbGraph::InvalidToken }
       end
 
-      describe '.secreet' do
-        subject { @app.secret }
-        it { is_expected.not_to be_empty }
+      context 'and access token is correct' do
+        before do
+          create_application({ id: facebook_app_id, secret: facebook_app_secret})
+          app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+          user = app.test_user!
+          @access_token = user.access_token
+        end
+
+        it 'should set all attributes specified value by argument' do
+          app = Facemock::FbGraph::Application.new(:app, access_token: @access_token)
+          app.fetch
+          expect(app.identifier).to eq facebook_app_id
+          expect(app.secret).to eq facebook_app_secret
+          expect(app.access_token).to be_nil
+        end
       end
     end
   end
 
-  describe '#fetch' do
-    before { @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret) }
+  describe '#test_user!' do
+    context 'when incorrect access token is specified' do
 
-    describe '.identifier' do
-      subject { @app.fetch.identifier }
-      it { is_expected.to eq @app.identifier }
+      it 'should raise error Facemoc::FbGraph::InvalidToken' do
+        app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+        app.access_token = "incorrect_token"
+        expect(lambda { app.test_user! }).to raise_error Facemock::FbGraph::InvalidToken
+      end
     end
 
-    describe '.secret' do
-      subject { @app.fetch.secret }
-      it { is_expected.to eq @app.secret }
+    context 'when identifier or secret is incorrect' do
+      before { Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret) }
+
+      it 'should raise error Facemoc::FbGraph::InvalidRequest' do
+        app = Facemock::FbGraph::Application.new(nil)
+        [nil, "", "hoge", facebook_app_id].each do |id|
+          app.identifier = id
+          [nil, "", "hoge"].each do |secret|
+            app.secret = secret
+            expect(lambda { app.test_user! }).to raise_error Facemock::FbGraph::InvalidRequest
+          end
+        end
+      end
     end
-  end
 
-  describe '#test_user!' do
-    before { @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret) }
+    context 'when identifier and secret is correct' do
+      before do
+        create_application({ id: facebook_app_id, secret: facebook_app_secret })
+        @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+      end
 
-    it 'should created user' do
-      expect(Facemock::FbGraph::Application::User.all).to be_empty
-      created_user = @app.test_user!
-      finded_user = Facemock::FbGraph::Application::User.find_by_id(created_user.id)
-      Facemock::FbGraph::Application::User.column_names.each do |column_name|
-        expect(created_user.send(column_name)).to eq finded_user.send(column_name)
+      it 'should created user' do
+        expect(Facemock::FbGraph::Application::User.all).to be_empty
+        created_user = @app.test_user!
+        finded_user = Facemock::FbGraph::Application::User.find_by_id(created_user.id)
+        Facemock::FbGraph::Application::User.column_names.each do |column_name|
+          expect(created_user.send(column_name)).to eq finded_user.send(column_name)
+        end
       end
     end
   end
   
   describe '#test_users' do
-    before do
-      @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+    context 'when identifier is invalid' do
+      before { Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret) }
+
+      it 'should raise error Facemock::FbGraph::InvalidRequest' do
+        [nil, "", facebook_app_id + 1].each do |id|
+          app = Facemock::FbGraph::Application.new(id)
+          expect(lambda{ app.test_users }).to raise_error Facemock::FbGraph::InvalidRequest
+        end
+      end
     end
 
-    context 'when test_user is not created' do
-      subject { @app.test_users }
+    context 'when secret is invalid' do
+      before { Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret) }
+
+      it 'should raise error Facemock::FbGraph::InvalidRequest' do
+        [nil, "", "incorrect_secret"].each do |secret|
+          app = Facemock::FbGraph::Application.new(facebook_app_id)
+          app.secret = secret
+          expect(lambda{ app.test_users }).to raise_error Facemock::FbGraph::InvalidRequest
+        end
+      end
+    end
 
-      it { is_expected.to be_kind_of Facemock::FbGraph::Application::TestUsers }
-      it { is_expected.to be_empty }
+    context 'when access_token is invalid' do
+      it 'should raise error Facemock::FbGraph::InvalidToken' do
+        app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
+        app.access_token = "incorrect_token"
+        expect(lambda{ app.test_users }).to raise_error Facemock::FbGraph::InvalidToken
+      end
     end
 
-    context 'when test_user is created' do
+    context 'when identifier and secret is correct' do
       before do
-        @user = @app.test_user!
+        create_application({ id: facebook_app_id, secret: facebook_app_secret })
+        @app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
       end
 
-      subject { @app.test_users }
-      it { is_expected.to be_kind_of Facemock::FbGraph::Application::TestUsers }
-      it { is_expected.not_to be_empty }
+      context 'when test_user is not created' do
+        subject { @app.test_users }
+
+        it { is_expected.to be_kind_of Facemock::FbGraph::Application::TestUsers }
+        it { is_expected.to be_empty }
+      end
+
+      context 'when test_user is created' do
+        before do
+          @user = @app.test_user!
+        end
+
+        subject { @app.test_users }
+        it { is_expected.to be_kind_of Facemock::FbGraph::Application::TestUsers }
+        it { is_expected.not_to be_empty }
 
-      describe '.first.id' do
-        subject { @app.test_users.first.id }
-        it { is_expected.to eq @user.id }
+        describe '.first.id' do
+          subject { @app.test_users.first.id }
+          it { is_expected.to eq @user.id }
+        end
       end
     end
   end

data/spec/facemock/fb_graph/user_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Facemock::FbGraph::User do
+  include ApplicationCreateHelper
+
   let(:db_name) { ".test" }
 
   let(:facebook_app_id) { "100000000000000" }
@@ -15,6 +17,7 @@ describe Facemock::FbGraph::User do
   describe '.me' do
     context 'when access_token is correct' do
       before do
+        create_application({ id: facebook_app_id, secret: "test_secret" })
         app = Facemock::FbGraph::Application.new(facebook_app_id, secret: facebook_app_secret)
         @user = app.test_user!
         @access_token = @user.access_token

data/spec/facemock/fb_graph_spec.rb

@@ -9,8 +9,9 @@ describe Facemock::FbGraph do
     expect(Facemock::FbGraph::User).to be_truthy
   end
 
-  it 'should have a invalid_token class' do
+  it 'should have a error class' do
     expect(Facemock::FbGraph::InvalidToken).to be_truthy
+    expect(Facemock::FbGraph::InvalidRequest).to be_truthy
   end
 
   describe '#on' do

data/spec/facemock_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Facemock do
-  let(:version) { '0.0.5' }
+  let(:version) { '0.0.6' }
   let(:db_name) { '.test' }
 
   describe 'VERSION' do

data/spec/support/application_create_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facemock
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -202,6 +202,7 @@ files:
 - spec/facemock/fb_graph_spec.rb
 - spec/facemock_spec.rb
 - spec/spec_helper.rb
+- spec/support/application_create_helper.rb
 - spec/support/tables_helper.rb
 homepage: https://github.com/ogawatti/facemock
 licenses:
@@ -218,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 28983518924956575
+      hash: -2374315487424674791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 28983518924956575
+      hash: -2374315487424674791
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -249,4 +250,5 @@ test_files:
 - spec/facemock/fb_graph_spec.rb
 - spec/facemock_spec.rb
 - spec/spec_helper.rb
+- spec/support/application_create_helper.rb
 - spec/support/tables_helper.rb