magerecord 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fb787d329be1321cde1538513746463082bb6ce
-  data.tar.gz: 0fba00602a82d7fcfbfbb559aaa0196987fb1d1c
+  metadata.gz: f0a65840b693a038d434aaac51847d65730b0cfc
+  data.tar.gz: 22708fa2c00d23c49ecc866f4d48c49b05bf473c
 SHA512:
-  metadata.gz: 58b4f1d384f4ff8bd613a7f70cc2a3e7dfe4f3a5c02475b31d3b0381061ed032ea7feb7f26cec8a9ac4b50f836bd361767d5531b21d37bc8021478bf04eb5249
-  data.tar.gz: 35c678593c0d0e7166c888a102c47c7a2c55c6cf18cc52c535c7d19f44429a279cd5c08b8dbb5e042b1658f6eaf35148ccad62fd4ff50a6475f3472c54d0879c
+  metadata.gz: ec23ceae27ed5aa8974a1765f8c24bb876b08aef7862c5c12fa7eb6b5be489e384470ec5282004e68bee260a8fc262fa1a69f597257649e5eb605ea4a89cccec
+  data.tar.gz: 9a19fc6698dc2ce49a9465f9d4a20c6e5f40a603dd117ae3476a0ed227a6c10de18d2d69e3e29981ad0c4002bc2503930753bb38ae65f0e1d1907a35baa561f0

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
-gem 'activerecord', '~> 4.0'
-gem 'mysql2', '~> 0.3.18', :platforms => :ruby
+gem 'activerecord', '>= 4.1'
+gem 'mysql2', '>= 0.4.0'
 
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -1,79 +1,88 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    arel (6.0.3)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (7.1.4)
     builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.2-java)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.12.4)
+    git (1.3.0)
+    github_api (0.11.3)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
+      descendants_tracker (~> 0.0.1)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
+      hashie (>= 1.2)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (3.4.3)
+    hashie (3.4.6)
     highline (1.7.8)
     i18n (0.7.0)
-    jeweler (2.0.1)
+    jar-dependencies (0.3.7)
+    jeweler (2.2.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
+      semver
     json (1.8.3)
     json (1.8.3-java)
-    jwt (1.5.2)
-    mini_portile (0.6.2)
-    minitest (5.8.2)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mysql2 (0.3.20)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-java)
-    oauth2 (1.0.0)
+    mysql2 (0.4.5)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-java)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.4)
-    rake (10.4.2)
+      rack (>= 1.2, < 3)
+    psych (2.2.1)
+    psych (2.2.1-java)
+      jar-dependencies (>= 0.1.7)
+    public_suffix (2.0.4)
+    rack (2.0.1)
+    rake (12.0.0)
     rdoc (3.12.2)
       json (~> 1.4)
+    semver (1.0.1)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
+    shoulda-context (1.2.2)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.10.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     thread_safe (0.3.5)
@@ -86,13 +95,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.0)
+  activerecord (>= 4.1)
   bundler (~> 1.0)
   jeweler (~> 2.0, >= 2.0.1)
-  mysql2 (~> 0.3.18)
+  mysql2 (>= 0.4.0)
   rdoc (~> 3.12)
   shoulda
   simplecov (~> 0)
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/magerecord/fitlion/order.rb

@@ -1,11 +1,21 @@
 module MageRecord
   # add custom FitLion-specific order methods
   class Order < ActiveRecord::Base
+    # mysql regex for postal codes that are in town
+    TOWN_REGEX = '^(0[1-9]|10|1[78]|2[2-4])'
+
     # ignore canceled orders
     default_scope { where state: [:processing, :complete] }
+
+    scope :prepaid, -> { joins(:payment).where("#{OrderPayment.table_name}.method NOT IN (?, ?)", 'cashondelivery', 'checkmo') }
+
     scope :delivery, -> { where shipping_method: [:flatrate_flatrate, :addon_addon] }
     scope :collection, -> { where "#{Order.table_name}.shipping_method LIKE 'selfcollect%'" }
 
+    scope :town, -> { joins(:shipping_address).where("sales_flat_order_address.postcode RLIKE ?", TOWN_REGEX) }
+    scope :residential, -> { joins(:shipping_address).where("sales_flat_order_address.postcode NOT RLIKE ?", TOWN_REGEX) }
+
+
     def for_delivery?
       %w{flatrate addon}.include? shipping_method.split('_').first
     end

data/lib/magerecord/fitlion/order_payment.rb

@@ -0,0 +1,7 @@
+module MageRecord
+  class OrderPayment < ActiveRecord::Base
+    def prepaid?
+      return method != 'cashondelivery'
+    end
+  end
+end

data/lib/magerecord/order.rb

@@ -2,12 +2,17 @@ module MageRecord
   class Order < ActiveRecord::Base
     self.table_name = :sales_flat_order
 
+    scope :cash, -> { joins(:payment).where("#{OrderPayment.table_name}.method = ?", 'cashondelivery') }
+    scope :cheque, -> { joins(:payment).where("#{OrderPayment.table_name}.method = ?", 'checkmo') }
+
     belongs_to :customer
 
     has_one :billing_address, -> { where address_type: 'billing' }, class_name: :OrderAddress, foreign_key: :parent_id
     has_one :shipping_address, -> { where address_type: 'shipping' }, class_name: :OrderAddress, foreign_key: :parent_id
+    has_one :payment, class_name: :OrderPayment, foreign_key: :parent_id
 
     has_many :items, class_name: :OrderItem
     has_many :products, through: :items
+    has_many :history, class_name: :OrderHistory, foreign_key: :parent_id
   end
 end

data/lib/magerecord/order_history.rb

@@ -0,0 +1,7 @@
+module MageRecord
+  class OrderHistory < ActiveRecord::Base
+    self.table_name = :sales_flat_order_status_history
+
+    belongs_to :order, foreign_key: :parent_id
+  end
+end

data/lib/magerecord/order_payment.rb

@@ -0,0 +1,16 @@
+module MageRecord
+  class OrderPayment < ActiveRecord::Base
+    self.table_name = :sales_flat_order_payment
+
+    belongs_to :order, foreign_key: :parent_id
+
+
+    def cash?
+      return method == 'cashondelivery'
+    end
+
+    def cheque?
+      return method == 'checkmo'
+    end
+  end
+end

data/lib/magerecord.rb

@@ -17,3 +17,5 @@ require 'magerecord/stock'
 require 'magerecord/order'
 require 'magerecord/order_item'
 require 'magerecord/order_address'
+require 'magerecord/order_history'
+require 'magerecord/order_payment'

data/magerecord.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: magerecord 0.3.1 ruby lib
+# stub: magerecord 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "magerecord"
-  s.version = "0.3.1"
+  s.name = "magerecord".freeze
+  s.version = "0.4.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-11-12"
-  s.description = "A simple ActiveRecord wrapper for various Magento models"
-  s.email = "xerokill@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Marc".freeze]
+  s.date = "2016-12-07"
+  s.description = "A simple ActiveRecord wrapper for various Magento models".freeze
+  s.email = "xerokill@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -34,12 +34,15 @@ Gem::Specification.new do |s|
     "lib/magerecord/fitlion/club.rb",
     "lib/magerecord/fitlion/ff_order.rb",
     "lib/magerecord/fitlion/order.rb",
+    "lib/magerecord/fitlion/order_payment.rb",
     "lib/magerecord/fitlion/product.rb",
     "lib/magerecord/fitlion/trainer.rb",
     "lib/magerecord/invoice_item.rb",
     "lib/magerecord/order.rb",
     "lib/magerecord/order_address.rb",
+    "lib/magerecord/order_history.rb",
     "lib/magerecord/order_item.rb",
+    "lib/magerecord/order_payment.rb",
     "lib/magerecord/product.rb",
     "lib/magerecord/product_attribute_set.rb",
     "lib/magerecord/stock.rb",
@@ -49,39 +52,39 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_magerecord.rb"
   ]
-  s.homepage = "http://github.com/mystix/magerecord"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5.1"
-  s.summary = "Simple ActiveRecord wrapper for Magento"
+  s.homepage = "http://github.com/mystix/magerecord".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "Simple ActiveRecord wrapper for Magento".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 4.0"])
-      s.add_runtime_dependency(%q<mysql2>, ["~> 0.3.18"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0"])
+      s.add_runtime_dependency(%q<activerecord>.freeze, [">= 4.1"])
+      s.add_runtime_dependency(%q<mysql2>.freeze, [">= 0.4.0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.0.1", "~> 2.0"])
+      s.add_development_dependency(%q<simplecov>.freeze, ["~> 0"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 4.0"])
-      s.add_dependency(%q<mysql2>, ["~> 0.3.18"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
-      s.add_dependency(%q<simplecov>, ["~> 0"])
+      s.add_dependency(%q<activerecord>.freeze, [">= 4.1"])
+      s.add_dependency(%q<mysql2>.freeze, [">= 0.4.0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1", "~> 2.0"])
+      s.add_dependency(%q<simplecov>.freeze, ["~> 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 4.0"])
-    s.add_dependency(%q<mysql2>, ["~> 0.3.18"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
-    s.add_dependency(%q<simplecov>, ["~> 0"])
+    s.add_dependency(%q<activerecord>.freeze, [">= 4.1"])
+    s.add_dependency(%q<mysql2>.freeze, [">= 0.4.0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1", "~> 2.0"])
+    s.add_dependency(%q<simplecov>.freeze, ["~> 0"])
   end
 end
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: magerecord
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Marc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -137,12 +137,15 @@ files:
 - lib/magerecord/fitlion/club.rb
 - lib/magerecord/fitlion/ff_order.rb
 - lib/magerecord/fitlion/order.rb
+- lib/magerecord/fitlion/order_payment.rb
 - lib/magerecord/fitlion/product.rb
 - lib/magerecord/fitlion/trainer.rb
 - lib/magerecord/invoice_item.rb
 - lib/magerecord/order.rb
 - lib/magerecord/order_address.rb
+- lib/magerecord/order_history.rb
 - lib/magerecord/order_item.rb
+- lib/magerecord/order_payment.rb
 - lib/magerecord/product.rb
 - lib/magerecord/product_attribute_set.rb
 - lib/magerecord/stock.rb
@@ -171,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple ActiveRecord wrapper for Magento