magerecord 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0a65840b693a038d434aaac51847d65730b0cfc
-  data.tar.gz: 22708fa2c00d23c49ecc866f4d48c49b05bf473c
+  metadata.gz: 72a8236850d5a3e4690c2dbc0798ad81943da3eb
+  data.tar.gz: 02503a7773e829640cf02c282d59ade8a36f1c6f
 SHA512:
-  metadata.gz: ec23ceae27ed5aa8974a1765f8c24bb876b08aef7862c5c12fa7eb6b5be489e384470ec5282004e68bee260a8fc262fa1a69f597257649e5eb605ea4a89cccec
-  data.tar.gz: 9a19fc6698dc2ce49a9465f9d4a20c6e5f40a603dd117ae3476a0ed227a6c10de18d2d69e3e29981ad0c4002bc2503930753bb38ae65f0e1d1907a35baa561f0
+  metadata.gz: 65baef82744f05ddca38b30b014e088599224ffe92e431289226e5be6e3a3a0c04d49773ca5428c140c4665bfbaa185c0db72c4884575e90dbb06f0f45ded593
+  data.tar.gz: f9d0808da055fbf1ab18b127c2ae3afd0b7f8caa0452c32b39e32e2be2416217691823569d99efd56982b8d62a66b4d89f14d3fdfc3c20c4353bdd83f1bacda6

data/Gemfile

@@ -7,8 +7,8 @@ gem 'mysql2', '>= 0.4.0'
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0", ">= 2.0.1"
-  gem "simplecov", "~> 0"
+  gem "rdoc", ">= 3.0"
+  gem "bundler", "~> 1.13"
+  gem "jeweler", ">= 2.0.1"
+  gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -1,107 +1,96 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    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)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    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)
+    addressable (2.4.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
     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.3.0)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.4.6)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.6)
     highline (1.7.8)
-    i18n (0.7.0)
-    jar-dependencies (0.3.7)
-    jeweler (2.2.1)
+    i18n (0.8.6)
+    jeweler (2.3.7)
       builder
-      bundler (>= 1.0)
+      bundler (>= 1)
       git (>= 1.2.5)
-      github_api (~> 0.11.0)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
       psych (~> 2.2)
       rake
       rdoc
-      semver
-    json (1.8.3)
-    json (1.8.3-java)
+      semver2
+    json (2.1.0)
     jwt (1.5.6)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    multi_json (1.12.1)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.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)
+    mysql2 (0.4.9)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       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)
+    psych (2.2.4)
+    rack (2.0.3)
+    rake (12.1.0)
+    rdoc (5.1.0)
+    semver2 (3.4.2)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.2)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.12.0)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    tzinfo (1.2.2)
+    simplecov-html (0.10.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   activerecord (>= 4.1)
-  bundler (~> 1.0)
-  jeweler (~> 2.0, >= 2.0.1)
+  bundler (~> 1.13)
+  jeweler (>= 2.0.1)
   mysql2 (>= 0.4.0)
-  rdoc (~> 3.12)
+  rdoc (>= 3.0)
   shoulda
-  simplecov (~> 0)
+  simplecov
 
 BUNDLED WITH
-   1.13.6
+   1.15.4

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/magerecord/coupon.rb

@@ -0,0 +1,6 @@
+module MageRecord
+  class Coupon < ActiveRecord::Base
+    self.table_name = :salesrule_coupon
+    self.inheritance_column = :_type_disabled
+  end
+end

data/lib/magerecord/fitlion/coupon.rb

@@ -0,0 +1,5 @@
+module MageRecord
+  class Coupon
+    has_many :usage, class_name: 'CouponUsage'
+  end
+end

data/lib/magerecord/fitlion/coupon_usage.rb

@@ -0,0 +1,14 @@
+require 'composite_primary_keys'
+
+module MageRecord
+  class CouponUsage < ActiveRecord::Base
+    self.table_name = :salesrule_coupon_usage
+
+    # note: requires composite_primary_keys gem specific to installed version of ActiveRecord
+    # (see https://github.com/composite-primary-keys/composite_primary_keys)
+    self.primary_keys = :coupon_id, :customer_id
+
+    belongs_to :coupon
+    belongs_to :customer
+  end
+end

data/lib/magerecord/fitlion/product.rb

@@ -5,32 +5,38 @@ module MageRecord
       "#{measurement} #{unit}"
     end
 
-
-    def full_name
-      if @fname.nil?
-        @fname = "#{name} (#{uom})"
-
-        # note: most bundles are not associated with any brand
-        if brand
-          @fname = "(#{brand}) #{@fname}"
-        end
+    def attributes
+      if @attribs.nil?
+        @attribs = {}
 
         # only simple/virtual products will have custom attributes
         if %w{simple virtual}.include?(type_id)
-          # get all custom product attributes specific to attribute set
+          # get all custom product attributes specific to attribute set (except "brand")
           attribs = set.downcase.gsub(/.*\((.+)\)/, "\\1").gsub(/ only/, '').split(' + ') - ['brand']
 
-          attribs.each do |attr|
-            @fname += " (#{send(attr.split(' ').join('_'))})"
+          attribs.map{ |a| a.split(' ').join('_') }.each do |attrib|
+            @attribs[attrib] = send(attrib)
           end
         end
       end
 
+      @attribs
+    end
+
+    def full_name(with_brand = true)
+      if @fname.nil?
+        @fname = "#{name} (#{uom})"
+
+        # note: most bundles are not associated with any brand
+        @fname = "(#{brand}) #{@fname}" if with_brand and brand
+
+        @fname = "#{@fname}#{attributes.values.map{ |a| " (#{a})" }.join}"
+      end
+
       # return cached full name
       @fname
     end
 
-
     def is_supplement?
       set.downcase.include? 'supplement'
     end

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.4.0 ruby lib
+# stub: magerecord 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "magerecord".freeze
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   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.date = "2017-10-04"
   s.description = "A simple ActiveRecord wrapper for various Magento models".freeze
   s.email = "xerokill@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -29,9 +29,12 @@ Gem::Specification.new do |s|
     "lib/magerecord.rb",
     "lib/magerecord/address.rb",
     "lib/magerecord/connection.rb",
+    "lib/magerecord/coupon.rb",
     "lib/magerecord/customer.rb",
     "lib/magerecord/eav_record.rb",
     "lib/magerecord/fitlion/club.rb",
+    "lib/magerecord/fitlion/coupon.rb",
+    "lib/magerecord/fitlion/coupon_usage.rb",
     "lib/magerecord/fitlion/ff_order.rb",
     "lib/magerecord/fitlion/order.rb",
     "lib/magerecord/fitlion/order_payment.rb",
@@ -54,7 +57,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mystix/magerecord".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.5.2".freeze
+  s.rubygems_version = "2.6.13".freeze
   s.summary = "Simple ActiveRecord wrapper for Magento".freeze
 
   if s.respond_to? :specification_version then
@@ -64,27 +67,27 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 3.0"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.13"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.0.1"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
       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"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 3.0"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.13"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
     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"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 3.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.13"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Marc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -56,30 +56,30 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +87,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,21 +94,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple ActiveRecord wrapper for various Magento models
@@ -132,9 +126,12 @@ files:
 - lib/magerecord.rb
 - lib/magerecord/address.rb
 - lib/magerecord/connection.rb
+- lib/magerecord/coupon.rb
 - lib/magerecord/customer.rb
 - lib/magerecord/eav_record.rb
 - lib/magerecord/fitlion/club.rb
+- lib/magerecord/fitlion/coupon.rb
+- lib/magerecord/fitlion/coupon_usage.rb
 - lib/magerecord/fitlion/ff_order.rb
 - lib/magerecord/fitlion/order.rb
 - lib/magerecord/fitlion/order_payment.rb
@@ -174,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple ActiveRecord wrapper for Magento