magerecord 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecae2f3322ca7917985b1576b351fb2196ec4494
-  data.tar.gz: c0d4b2c015e07de39b80757a2227a21708eae52a
+  metadata.gz: 14449d50d876d516d63b163211de3ccca7d1e90a
+  data.tar.gz: 5af2ec167120fc4575d85af860d890741cd1e5f2
 SHA512:
-  metadata.gz: c0fe44bb200dd3b70cc741c82d84a33cc22c253a9cbe1a65b7970cbd02813cc048899718f46271de27d61b87c8116c2d6b23d5407acc6b7b3748c54a3e22a7da
-  data.tar.gz: 0febd025b4f2cb970de7c45a2edaf1c2335f22f14bde96979d4c8312055134e268b98e0cbf9061901f95c037d73b6dc8541502e3ebfb03b2bb0e859933c891f2
+  metadata.gz: 1c170d33b73d069c866a99ead9732f00f3f8dea6758cbd80e432a091349d7ae6a7294ed626258420842eb3050517be80b5c9d6cd646cc1344e71cdffab4494ba
+  data.tar.gz: 88eb679ae4a7c89232922345bc7119f25d96b180af230daa7582557075624ac9631b1170c458063c4382690877d4bbe9dc014305de259b2fafb92f493ddc9c21

data/Gemfile

@@ -1,13 +1,10 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'activerecord', '>= 4.0.4'
 gem 'mysql2', :platforms => :ruby
 
-gem 'activerecord-jdbc-adapter', :platforms => :jruby
-gem 'jdbc-mysql', :platforms => :jruby
-
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,16 +1,14 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
       arel (~> 6.0)
-    activerecord-jdbc-adapter (1.3.14)
-      activerecord (>= 2.2)
-    activesupport (4.2.0)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -36,7 +34,6 @@ GEM
     hashie (3.4.0)
     highline (1.7.1)
     i18n (0.7.0)
-    jdbc-mysql (5.1.33)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -48,10 +45,10 @@ GEM
       rdoc
     json (1.8.2)
     json (1.8.2-java)
-    jwt (1.3.0)
+    jwt (1.4.1)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.3.18)
@@ -79,8 +76,8 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
-    thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -90,9 +87,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 4.0.4)
-  activerecord-jdbc-adapter
   bundler (~> 1.0)
-  jdbc-mysql
   jeweler (~> 2.0.1)
   mysql2
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.2.0

data/lib/magerecord/fitlion/order.rb

@@ -0,0 +1,17 @@
+module MageRecord
+  # add custom FitLion-specific order methods
+  class Order < ActiveRecord::Base
+    # ignore canceled orders
+    default_scope { where state: [:processing, :complete] }
+    scope :delivery, -> { where shipping_method: [:flatrate_flatrate :addon_addon] }
+    scope :collection, -> { where "#{self.class.table_name}.shipping_method LIKE 'selfcollect%'" }
+
+    def for_delivery?
+      %w{flatrate addon}.include? shipping_method.split('_').first
+    end
+
+    def for_collection?
+      shipping_method.include? 'selfcollect'
+    end
+  end
+end

data/lib/magerecord/order.rb

@@ -2,9 +2,6 @@ module MageRecord
   class Order < ActiveRecord::Base
     self.table_name = :sales_flat_order
 
-    # ignore canceled orders
-    default_scope { where status: [:processing, :complete] }
-
     belongs_to :customer
 
     has_one :billing_address, -> { where address_type: 'billing' }, class_name: :OrderAddress, foreign_key: :parent_id

data/magerecord.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: magerecord 0.1.12 ruby lib
+# stub: magerecord 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "magerecord"
-  s.version = "0.1.12"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Marc"]
-  s.date = "2015-02-25"
+  s.date = "2015-03-23"
   s.description = "A simple ActiveRecord wrapper for various Magento models"
   s.email = "xerokill@gmail.com"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/magerecord/connection.rb",
     "lib/magerecord/customer.rb",
     "lib/magerecord/eav_record.rb",
+    "lib/magerecord/fitlion/order.rb",
     "lib/magerecord/fitlion/product.rb",
     "lib/magerecord/order.rb",
     "lib/magerecord/order_address.rb",
@@ -55,8 +56,6 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 4.0.4"])
       s.add_runtime_dependency(%q<mysql2>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
-      s.add_runtime_dependency(%q<jdbc-mysql>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -65,8 +64,6 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activerecord>, [">= 4.0.4"])
       s.add_dependency(%q<mysql2>, [">= 0"])
-      s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
-      s.add_dependency(%q<jdbc-mysql>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -76,8 +73,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activerecord>, [">= 4.0.4"])
     s.add_dependency(%q<mysql2>, [">= 0"])
-    s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
-    s.add_dependency(%q<jdbc-mysql>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Marc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbc-adapter
-  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: jdbc-mysql
-  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: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +128,7 @@ files:
 - lib/magerecord/connection.rb
 - lib/magerecord/customer.rb
 - lib/magerecord/eav_record.rb
+- lib/magerecord/fitlion/order.rb
 - lib/magerecord/fitlion/product.rb
 - lib/magerecord/order.rb
 - lib/magerecord/order_address.rb