rusic 1.9.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff81463e2ae25cc0dc726fcd831265522318f52
-  data.tar.gz: 5461ad6626aa958abf1ca8816ae176fbcdc810ec
+  metadata.gz: 3f64e6f298aee830ae7ee989c147de8c5eff2566
+  data.tar.gz: 875d333932c8971d940c38e5296031bb63e0ecc6
 SHA512:
-  metadata.gz: 630dbedafc8a769379ec32062457bab0e5d54dfa465d677211635b9d9cc5ba69a557238f7cd552691b3308cffacd3047b6cb8adb8f4eade09403275bf68863e1
-  data.tar.gz: ea4d90a483028a92a942220403e395aa998cdaa9e2d5c9fb8ff26f3fdf8ac96f64ca686daf0970960636c478cf198f78abfca69e63a225e9605b2a3a2014b360
+  metadata.gz: 306f6076a71c985f5d8388145aa8f96aefa0da4cd3e04c65ec2bccbbb208f5506466f811806d281ccf802329a386cf162cb02109cffdae5a969619d304ff2888
+  data.tar.gz: e09f3dec26d84d00c4e23625166cb6579d3236d0175ad59cd741b89b4abbfcc534536ab4c10da10af72be5bf782f5c83c54093420f5d3783655382c10f14b60c

data/Gemfile

@@ -4,6 +4,10 @@ source 'http://rubygems.org'
 gemspec
 
 group :development do
-  gem 'guard'
-  gem 'guard-shell'
+  gem 'guard', '~> 2.13.0'
+  gem 'guard-shell', '~> 0.7.1'
+  gem 'pry'
+  gem 'rspec'
+  gem 'guard-rspec', require: false
+  gem 'awesome_print'
 end

data/Guardfile

@@ -1,9 +1,63 @@
 require './lib/rusic/version'
 
-guard :shell do
-  watch(%r{lib/.*}) {
-    `gem build ./rusic.gemspec`
-    `gem install rusic-#{Rusic::VERSION}.gem`
-    `rm rusic-#{Rusic::VERSION}.gem`
-  }
+# guard :shell do
+  # watch(%r{lib/.*}) {
+  #   `gem build ./rusic.gemspec`
+  #   `gem install rusic-#{Rusic::VERSION}.gem`
+  #   `rm rusic-#{Rusic::VERSION}.gem`
+  # }
+# end
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: 'rspec --color --format doc' do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.("routing/#{m[1]}_routing"),
+      rspec.spec.("controllers/#{m[1]}_controller"),
+      rspec.spec.("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
 end

data/lib/rusic/uploaders/base.rb

@@ -18,7 +18,8 @@ module Rusic
           begin
             perform
             print(' [done]'.green)
-          rescue RestClient::UnprocessableEntity, RestClient::Exception
+          rescue RestClient::UnprocessableEntity, RestClient::Exception => e
+            puts e
             print(' [failed]'.red)
           end
         end

data/lib/rusic/uploaders/custom_attributes.rb

@@ -1,48 +1,50 @@
+require 'pry'
+require 'awesome_print'
+
 module Rusic
   module Uploaders
     class CustomAttributes < Base
       def perform
-        client["themes/#{theme}"].put(params)
-      end
-
-      private
-
-      def message
-        "Updating custom attributes"
+        client["themes/#{theme}/custom_attribute_collections"].post(params.to_json, content_type: :json)
       end
 
       def params
-        params_hash = {
-          'theme' => {
-            'custom_attributes_attributes' => {}
-          }
+        parameters = {
+          custom_attribute_collections: []
         }
-
-        attributes_from_file.each_with_index do |(key, options), i|
-          params_hash['theme']['custom_attributes_attributes'][i] = {
-            'key' => key,
-            'value' => options.fetch('value'),
-            'help_text' => options.fetch('help_text', ''),
-            'input_type' => options.fetch('type', 'text')
+        attribute_collections.each do |attribute_collection_key, attribute_collection|
+          custom_attribute_collection = {
+            key: attribute_collection_key,
+            title: attribute_collection["title"],
+            help_title: attribute_collection.fetch('help_title', nil),
+            help_body: attribute_collection.fetch('help_body', nil),
+            custom_attributes: [],
           }
-
-          if options.fetch('select_options', nil)
-            params_hash['theme']['custom_attributes_attributes'][i]['select_options'] = options.fetch('select_options')
-          end
-
-          if e_attr = existing_attributes[key]
-            params_hash['theme']['custom_attributes_attributes'][i]['id'] = e_attr['id']
+          attribute_collection["attributes"].each do |attribute_key, attribute|
+            custom_attribute_collection[:custom_attributes] << {
+              'key' => attribute_key,
+              'value' => attribute.fetch('value'),
+              'help_text' => attribute.fetch('help_text', ''),
+              'input_type' => attribute.fetch('type', 'string'),
+              'select_options' => attribute.fetch('select_options', nil),
+            }
           end
+          parameters[:custom_attribute_collections] << custom_attribute_collection
         end
-        params_hash
+        parameters
+      end
+
+      private
+
+      def message
+        "Updating custom attributes"
       end
 
-      def existing_attributes
-        @existing_attributes ||= JSON.parse(client["themes/#{theme}"].get)
-        Hash[@existing_attributes.fetch('custom_attributes', []).map {|i| [i['key'], i] }]
+      def attribute_collections
+        attributes_file["custom_attribute_collections"]
       end
 
-      def attributes_from_file
+      def attributes_file
         ::YAML::load_file(file.file) || {}
       end
     end

data/lib/rusic/version.rb

@@ -1,3 +1,3 @@
 module Rusic
-  VERSION = "1.9.1"
+  VERSION = "2.0.0"
 end

data/spec/fixtures/attributes.yml

@@ -0,0 +1,23 @@
+custom_attribute_collections:
+  awesome_group:
+    title: Awesome Group Title
+    help_title: Do something awesome
+    help_body: Here is some help to being awesome
+    attributes:
+      some_nested_text_1:
+        value: Example
+        help_text: Example Help Text
+      some_other_text_1:
+        value: Example
+        help_text: Example Help Text
+  ok_group:
+    title: OK Group Title
+    help_title: Do something average
+    help_body: Here is some help to being alright
+    attributes:
+      some_nested_text_2:
+        value: Example2
+        help_text: Example Help Text
+      some_other_text_2:
+        value: Example2
+        help_text: Example Help Text

data/spec/lib/rusic/uploaders/custom_attributes_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+RSpec.describe Rusic::Uploaders::CustomAttributes do
+  before do
+    @custom_attributes_uploader = Rusic::Uploaders::CustomAttributes.new(nil)
+
+    allow(@custom_attributes_uploader).to receive(:attributes_file) {
+      attributes_file = File.join(File.dirname(__FILE__), '..', '..', '..', 'fixtures', 'attributes.yml')
+      YAML.load(File.open(attributes_file))
+    }
+  end
+
+  it "returns params" do
+    expect(@custom_attributes_uploader.params).to eq({
+      custom_attribute_collections: [
+        {
+          key: "awesome_group",
+          title: "Awesome Group Title",
+          help_title: "Do something awesome",
+          help_body: "Here is some help to being awesome",
+          custom_attributes: [
+            {
+            "key" => "some_nested_text_1",
+            "value" => "Example",
+            "help_text" => "Example Help Text",
+            "input_type" => "text",
+            "select_options" => nil
+            },
+            {
+              "key" => "some_other_text_1",
+              "value" => "Example",
+              "help_text" => "Example Help Text",
+              "input_type" => "text",
+              "select_options" => nil
+            }
+          ]
+        },
+        {
+          key: "ok_group",
+          title: "OK Group Title",
+          help_title: "Do something average",
+          help_body: "Here is some help to being alright",
+          custom_attributes: [
+            {
+              "key" => "some_nested_text_2",
+              "value" => "Example2",
+              "help_text" => "Example Help Text",
+              "input_type" => "text",
+              "select_options" => nil
+            },
+            {
+              "key" => "some_other_text_2",
+              "value" => "Example2",
+              "help_text" => "Example Help Text",
+              "input_type" => "text",
+              "select_options" => nil
+            }
+          ]
+        }
+      ]
+    })
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rusic'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rusic
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Mytton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -129,6 +129,9 @@ files:
 - lib/rusic/uploaders/template.rb
 - lib/rusic/version.rb
 - rusic.gemspec
+- spec/fixtures/attributes.yml
+- spec/lib/rusic/uploaders/custom_attributes_spec.rb
+- spec/spec_helper.rb
 homepage: http://developer.rusic.com/
 licenses:
 - MIT
@@ -153,4 +156,7 @@ rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Generate and deploy themes to Rusic
-test_files: []
+test_files:
+- spec/fixtures/attributes.yml
+- spec/lib/rusic/uploaders/custom_attributes_spec.rb
+- spec/spec_helper.rb