crud-service 0.0.9 → 0.1.0

data/spec/{unit/service_spec.rb → service_spec.rb}

@@ -1,4 +1,4 @@
-require "helper"
+require "spec_helper"
 
 describe CrudService::Service do
   before(:each) do
@@ -10,16 +10,16 @@ describe CrudService::Service do
 
   describe '#initialize' do 
     it 'should inject dependencies correctly' do
-      @generic_service.dal.should eq @mock_dal
-      @generic_service.log.should eq @mock_log
+      expect(@generic_service.dal).to eq(@mock_dal)
+      expect(@generic_service.log).to eq(@mock_log)
     end
   end
 
   describe '#insert' do
     it 'should call DAL insert' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:insert).with(query).and_return(true)
-      @generic_service.insert(query).should eq true
+      expect(@mock_dal).to receive(:insert).with(query).and_return(true)
+      expect(@generic_service.insert(query)).to eq(true)
     end
   end
 
@@ -30,75 +30,75 @@ describe CrudService::Service do
 
       query = { 'code_alpha_3' => 'GBR' }
 
-      @mock_dal.should_receive(:get_all_by_query)
+      expect(@mock_dal).to receive(:get_all_by_query)
         .with(query)
         .and_return(data)
 
-      @mock_dal.should_receive(:map_in_included_relations!)
+      expect(@mock_dal).to receive(:map_in_included_relations!)
         .with(data,query)
         .and_return(data)
 
-      @generic_service.get_all_by_query(query).should eq(data)
+      expect(@generic_service.get_all_by_query(query)).to eq(data)
     end
   end
 
   describe '#get_one_by_query' do
     it 'should call DAL get_one_by_query' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:get_all_by_query).with(query).and_return([query])
-      @mock_dal.should_receive(:map_in_included_relations!).and_return(true)
-      @generic_service.get_one_by_query(query).should eq query
+      expect(@mock_dal).to receive(:get_all_by_query).with(query).and_return([query])
+      expect(@mock_dal).to receive(:map_in_included_relations!).and_return(true)
+      expect(@generic_service.get_one_by_query(query)).to eq(query)
     end
   end
 
   describe '#update_by_primary_key' do
     it 'should call DAL update_by_primary_key' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:update_by_primary_key).with(2,query).and_return(true)
-      @generic_service.update_by_primary_key(2,query).should eq true
+      expect(@mock_dal).to receive(:update_by_primary_key).with(2,query).and_return(true)
+      expect(@generic_service.update_by_primary_key(2,query)).to eq(true)
     end
   end
 
   describe '#delete_by_primary_key' do
     it 'should call DAL delete_by_primary_key' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:delete_by_primary_key).with(query).and_return(true)
-      @generic_service.delete_by_primary_key(query).should eq true
+      expect(@mock_dal).to receive(:delete_by_primary_key).with(query).and_return(true)
+      expect(@generic_service.delete_by_primary_key(query)).to eq(true)
     end
   end
 
   describe '#exists_by_primary_key?' do
     it 'should call DAL exists_by_primary_key?' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:exists_by_primary_key?).with(query).and_return(true)
-      @generic_service.exists_by_primary_key?(query).should eq true
+      expect(@mock_dal).to receive(:exists_by_primary_key?).with(query).and_return(true)
+      expect(@generic_service.exists_by_primary_key?(query)).to eq(true)
     end
   end
 
   describe '#valid_insert?' do 
     it 'should call DAL valid_insert?' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:valid_insert?).with(query).and_return(true)
+      expect(@mock_dal).to receive(:valid_insert?).with(query).and_return(true)
 
-      @generic_service.valid_insert?(query).should eq true
+      expect(@generic_service.valid_insert?(query)).to eq(true)
     end
   end
 
   describe '#valid_query?' do 
     it 'should call DAL valid_query?' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:valid_query?).with(query).and_return(true)
+      expect(@mock_dal).to receive(:valid_query?).with(query).and_return(true)
 
-      @generic_service.valid_query?(query).should eq true
+      expect(@generic_service.valid_query?(query)).to eq(true)
     end
   end
 
   describe '#valid_update?' do 
     it 'should call DAL valid_update?' do
       query = { "one" => "two" }
-      @mock_dal.should_receive(:valid_update?).with(query).and_return(true)
+      expect(@mock_dal).to receive(:valid_update?).with(query).and_return(true)
 
-      @generic_service.valid_update?(query).should eq true
+      expect(@generic_service.valid_update?(query)).to eq(true)
     end
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,58 @@
+require "dotenv"
+Dotenv.load
+
+require 'ostruct'
+
+module Helpers
+  def mysql_mock
+    mysql = double("Mysql2")
+    allow(mysql).to receive(:escape) do |s|
+      Mysql2::Client.escape(s)
+    end
+    mysql
+  end
+
+  # Mock a Mysql Result object that returns each_hash
+  def mysql_result_mock(data)
+    result = double("Result")
+
+    allow(result).to receive(:each) { |&block|
+      data.each { |item| block.call(item) }
+    }
+
+    allow(result).to receive(:count).and_return(data.length)
+
+    result
+  end
+
+  # Make the supplied memcache_mock null (no hits, null write)
+  def memcache_null(memcache_mock)
+    allow(@mock_memcache).to receive(:get).and_return(nil)
+    allow(@mock_memcache).to receive(:set).and_return(nil)
+    allow(@mock_memcache).to receive(:incr).and_return(nil)
+  end
+end
+
+RSpec.configure do |c|
+  c.include Helpers
+end
+
+# Supress Warnings
+warn_level = $VERBOSE
+$VERBOSE = nil
+
+if ENV.has_key?('SIMPLECOV')
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+else
+  require 'coveralls'
+  Coveralls.wear!
+end
+
+require 'crud-service'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crud-service
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Tom Cully
@@ -9,172 +9,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '0.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: dalli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-- !ruby/object:Gem::Dependency
-  name: json
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :runtime
+        version: '3.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.13
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.13
-  type: :runtime
+        version: '3.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.13
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
-  type: :runtime
+        version: '0.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '0.6'
 description: A basic library for automatic CRUD services using only Sinatra, MySQL
   and Memcache
 email:
@@ -184,14 +146,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/api.rb
 - lib/crud-service.rb
-- lib/dal.rb
-- lib/service.rb
-- spec/helper.rb
-- spec/helpers_spec.rb
-- spec/unit/dal_spec.rb
-- spec/unit/service_spec.rb
+- lib/crud-service/api.rb
+- lib/crud-service/dal.rb
+- lib/crud-service/service.rb
+- lib/crud-service/version.rb
+- spec/api_spec.rb
+- spec/dal_spec.rb
+- spec/service_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/tomcully/crud-service
 licenses:
 - Apache2
@@ -202,22 +165,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Sinatra/MySQL/Memcache CRUD Service Library
 test_files:
-- spec/helper.rb
-- spec/helpers_spec.rb
-- spec/unit/dal_spec.rb
-- spec/unit/service_spec.rb
+- spec/api_spec.rb
+- spec/dal_spec.rb
+- spec/service_spec.rb
+- spec/spec_helper.rb
+has_rdoc: