ramen-rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4bdf745220103d28895c16d259b69f1e390fd44
-  data.tar.gz: 4e9e118f904506cd55e13dfedb109ed4a313dd5f
+  metadata.gz: 9de77426d862cf8695c418cc468c76e3760a89cd
+  data.tar.gz: b09b033f511c2a342e1eac842a14068d2fb4fd98
 SHA512:
-  metadata.gz: ae8cffe0b2ba0ee8b09d92c6aefb7c72c11dc2cd5799743a2a2d45de836256caab170ac8522c380c3a8161b5d044588da90c782d0649de7bf57c6a9b5b3e81e1
-  data.tar.gz: 7b1593f7be00a1e2ce9a6c33440557ab92c37cc0663b8a160c8c7b87e593a6bcd08407884738e22f1f71f83ef54d397f9eb5c8313108e274ba3c30ff893ae815
+  metadata.gz: acb1e662f59381d32a1bc9fb764c94b2de8e6bf138aaf63d150c0afcba4e6f271d8dd2211d894d1430ddca5a5e262f951713ea80227f4e0868a7cd91f9938cad
+  data.tar.gz: 6937e82d0cf6a6bd1cd1a8472ec4f446d7e25a55a3d0a865b2914b54c5e7a563f1c33dc4059f14a9ad2c53607cb20670f02c895fd8e784793e94d8b82b160ae0

data/CHANGELOG

@@ -16,3 +16,6 @@ in <script> tags.
 
 Version 0.5.0
 Add support for Companies
+
+Version 0.5.1
+Make importer support Companies. Add tests for importer.

data/lib/ramen-rails/config.rb

@@ -10,9 +10,7 @@ module RamenRails
         :return_url,
         :return_label,
         :ramen_js_asset_uri,
-        :custom_links,
-        :import_user_labels,
-        :import_user_value
+        :custom_links
     
       def ensure_not_lambda!(v)
         if v.lambda?
@@ -85,6 +83,31 @@ module RamenRails
       def current_user_labels
         @current_user_labels
       end
+     
+      attr_reader :import_company_labels
+      def import_company_labels=(value)
+        raise ArgumentError, "import_company_labels should be a Proc" unless value.kind_of?(Proc)
+        ensure_not_lambda!(value)
+        
+        @import_company_labels = value
+      end
+      
+      attr_reader :import_user_labels
+      def import_user_labels=(value)
+        raise ArgumentError, "import_user_labels should be a Proc" unless value.kind_of?(Proc)
+        ensure_not_lambda!(value)
+        
+        @import_user_labels = value
+      end
+
+      attr_reader :import_user_value
+      def import_user_value=(value)
+        raise ArgumentError, "import_user_value should be a Proc" unless value.kind_of?(Proc)
+        ensure_not_lambda!(value)
+        
+        @import_user_value = value
+      end
+
 
       def organization_id=(value)
         @organization_id = value

data/lib/ramen-rails/import.rb

@@ -12,9 +12,15 @@ module RamenRails
     end
 
     attr_accessor :user
+    attr_accessor :company
 
-    def initialize(opts)
+    def initialize(opts = {})
       self.user = opts[:user]
+      self.company = opts[:company]
+    end
+
+    def can_get_company_labels?
+      RamenRails.config.import_company_labels.present?
     end
 
     def can_get_labels?
@@ -25,6 +31,11 @@ module RamenRails
       RamenRails.config.import_user_value.present?
     end
 
+    def get_company_labels
+      company.
+        instance_eval(&RamenRails.config.import_company_labels)
+    end
+
     def get_labels
       user.
         instance_eval(&RamenRails.config.import_user_labels)
@@ -36,10 +47,37 @@ module RamenRails
     end
 
     def import
+      h = generate_hash
+      json = h.to_json
+
+      endpoint = ENV['RAMEN_IMPORT_URI'] || "https://ramen.is/po.json"
+      uri = URI("#{endpoint}?json_payload=#{CGI.escape(json)}")
+      start = Time.now.to_f
+      resp = Net::HTTP.get_response(uri)
+      total = Time.now.to_f - start
+
+      if resp.code == "200"
+        puts "Imported #{obj[:name]} <#{obj[:email]}> in #{total} seconds"
+      else
+        puts "ERROR (#{resp.code}) Importing #{obj[:name]} <#{obj[:email]}>. Continuing...."
+        puts resp.body.to_s
+      end
+    end
+
+    def generate_hash
       obj = {}
       [:email, :name, :id].each do |attr|
         obj[attr] = user.send(attr)
       end
+     
+      company_obj = {}
+      if company
+        [:url, :name, :id].each do |attr|
+          company_obj[attr] = user.send(attr)
+        end
+        
+        company_obj[:labels] = get_company_labels if can_get_company_labels?
+      end
 
       obj[:labels] = get_labels if can_get_labels?
       obj[:value] = get_value if can_get_value?
@@ -60,20 +98,9 @@ module RamenRails
         import: true
       }
 
-      json = h.to_json
-
-      endpoint = ENV['RAMEN_IMPORT_URI'] || "https://ramen.is/po.json"
-      uri = URI("#{endpoint}?json_payload=#{CGI.escape(json)}")
-      start = Time.now.to_f
-      resp = Net::HTTP.get_response(uri)
-      total = Time.now.to_f - start
-
-      if resp.code == "200"
-        puts "Imported #{obj[:name]} <#{obj[:email]}> in #{total} seconds"
-      else
-        puts "ERROR (#{resp.code}) Importing #{obj[:name]} <#{obj[:email]}>. Continuing...."
-        puts resp.body.to_s
-      end
+      h[:company] = company_obj if company_obj.present?
+    
+      h
     end
   end
 end

data/lib/ramen-rails/version.rb

@@ -1,3 +1,3 @@
 module RamenRails
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/lib/import_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe "RamenRails::Import" do
+
+  before :each do
+    @user = Hashie::Mash.new(name: 'Ryan', email: 'ryan@ramen.is', id: '1234')
+    @organization_id = rand(1_000_000)
+    @organization_secret = rand(1_000_000)
+
+    RamenRails.config do |config|
+      config.organization_id = @organization_id
+      config.organization_secret = @organization_secret
+      config.current_user = Proc.new { @user }
+    end
+  
+    @importer = RamenRails::Import.new
+    @importer.user = @user
+  end
+
+  it "should have user info in hash" do
+    expect(@importer.generate_hash[:user][:email]).
+      to eq('ryan@ramen.is')
+  end
+
+  it "should not have company data" do
+    expect(@importer.generate_hash[:company]).to be_nil
+  end
+
+  it "should set :import true" do
+    expect(@importer.generate_hash[:import]).to eq(true)
+  end
+
+  context "with a company" do
+    before :each do
+      @company = Hashie::Mash.new({id: 1234, url: 'https://ramen.is', name: 'Fake Rake'})
+      @importer.company = @company
+    end
+
+    it "should have company data" do
+      expect(@importer.generate_hash[:company][:id]).
+        to eq("1234")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ramen-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ryan Angilly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -123,6 +123,7 @@ files:
 - lib/ramen-rails/version.rb
 - ramen-rails.gemspec
 - spec/lib/config_spec.rb
+- spec/lib/import_spec.rb
 - spec/lib/ramen_after_filter_spec.rb
 - spec/lib/script_tag_helper_spec.rb
 - spec/spec_helper.rb
@@ -152,6 +153,7 @@ specification_version: 4
 summary: Rails gem for Ramen (https://ramen.is)
 test_files:
 - spec/lib/config_spec.rb
+- spec/lib/import_spec.rb
 - spec/lib/ramen_after_filter_spec.rb
 - spec/lib/script_tag_helper_spec.rb
 - spec/spec_helper.rb