smalruby-editor 0.3.5 → 0.4.0

data/spec/models/concerns/ruby_to_block/block/shared/block_examples.rb

@@ -9,7 +9,7 @@ shared_context ':character_new_data', character_new_data: true do
     <<-EOS.strip_heredoc
 require "smalruby"
 
-car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0)
 #{parts}
     EOS
   }
@@ -20,7 +20,7 @@ shared_context ':on_start_data', on_start_data: true do
     <<-EOS.strip_heredoc
 require "smalruby"
 
-car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0)
 
 car1.on(:start) do
   #{parts.lines.join('  ')}

data/spec/spec_helper.rb

@@ -94,22 +94,14 @@ RSpec.configure do |config|
     }
   end
 
+  Capybara.asset_host = "http://localhost:3000"
+
   config.include JsonSpec::Helpers
   config.include ERB::Util, type: :helper
   config.include ERB::Util, type: :feature
   config.include ActionView::Helpers::JavaScriptHelper, type: :feature
   config.include FeatureHelper, type: :feature
 
-  config.before(:each) do
-    Preference.user_defaults.each do |key, value|
-      Preference[key] = value
-    end
-    Preference.admin_defaults.each do |key, value|
-      Preference[key] = value
-    end
-    Preference["disabled_add_character_from_beginning"] = true
-  end
-
   config.after(javascript: true) do
     page.execute_script('window.onbeforeunload = null')
     FileUtils.rm_rf(downloads_dir) if selenium?
@@ -136,7 +128,26 @@ RSpec.configure do |config|
     DatabaseRewinder.clean_all
   end
 
+  config.before(:each) do
+    Preference.user_defaults.each do |key, value|
+      Preference[key] = value
+    end
+    Preference.admin_defaults.each do |key, value|
+      Preference[key] = value
+    end
+    Preference["disabled_add_character_from_beginning"] = true
+
+    load(Rails.root.join("db/seeds.rb"))
+  end
+
   config.after :each do
     DatabaseRewinder.clean
   end
+
+  # for debug
+  config.after(:each, javascript: true, open_on_error: true) do
+    if example.exception.present?
+      save_and_open_page
+    end
+  end
 end

data/spec/steps/standalone_steps.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
 step ":name としてログインする" do |name|
-  step %{"signin-button" をクリックする}
+  step %{"#signin-button" をクリックする}
   step %{JavaScriptによるアニメーションが終わるまで待つ}
   step %{"signin-modal-username" に "#{name}" を指定する}
-  step %{"signin-modal-ok-button" をクリックする}
+  step %{"#signin-modal-ok-button" をクリックする}
   step %{JavaScriptによるリクエストが終わるまで待つ}
   step %{JavaScriptによるアニメーションが終わるまで待つ}
 end
@@ -14,7 +14,7 @@ step "ログインする" do
 end
 
 step "ログアウトする" do
-  step %{"submenu-button" をクリックする}
+  step %{"#submenu-button" をクリックする}
   step %{サブメニューの "#signout-button" をクリックする}
   step %{JavaScriptによるリクエストが終わるまで待つ}
   step %{"#main-menu" に "ログイン" を含むこと}

data/spec/steps/then_steps.rb

@@ -20,6 +20,34 @@ step ':parent に :name が表示されていないこと' do |parent, name|
   end
 end
 
+step ':parent に次の要素が表示されていること:' do |parent, table|
+  within(name_to(parent)) do
+    table.hashes.each do |h|
+      expect(page.all(name_to(h["selecter"]), visible: true)).not_to be_empty
+    end
+  end
+end
+
+step ':parent に次の要素が表示されていないこと:' do |parent, table|
+  within(name_to(parent)) do
+    table.hashes.each do |h|
+      expect(page.all(name_to(h["selecter"]), visible: true)).to be_empty
+    end
+  end
+end
+
+step ':parent に文字 :text が表示されていること' do |parent, text|
+  within(name_to(parent)) do
+    expect(page).to have_content(text)
+  end
+end
+
+step ':parent に文字 :text が表示されていないこと' do |parent, text|
+  within(name_to(parent)) do
+    expect(page).not_to have_content(text)
+  end
+end
+
 step 'コンボボックス :name の :option_label を選択していること' do
   |name, option_label|
   expect(find(%{select[name="#{name}"] option[selected]}).text)

data/spec/steps/when_steps.rb

@@ -57,17 +57,17 @@ step 'プログラムの名前に :filename を指定する' do |filename|
   step %("プログラム名の入力欄" に "#{filename}" を指定する)
 end
 
-step 'サブメニューの :name をクリックする' do |name|
+step ':selector をクリックする' do |selector|
   # HACK: 以下では期待通りの動作にならなかったのでjQueryで無理やり実現した
   # click_on('submenu-button')
   # click_on(name_to(name, :id))
-  page.execute_script("$('#{name_to(name)}').click()")
-  step %{JavaScriptによるリクエストが終わるまで待つ}
-  step %{JavaScriptによるアニメーションが終わるまで待つ}
+  page.execute_script("$('#{name_to(selector)}').click()")
 end
 
-step ':name をクリックする' do |name|
-  click_on(name_to(name, :id))
+step 'サブメニューの :selector をクリックする' do |selector|
+  step %{"#{selector}" をクリックする}
+  step %{JavaScriptによるリクエストが終わるまで待つ}
+  step %{JavaScriptによるアニメーションが終わるまで待つ}
 end
 
 step 'ダウンロードが完了するまで待つ' do
@@ -88,16 +88,19 @@ step ':name にフォーカスを移す' do |name|
   JS
 end
 
-step ':filename をロードする' do |filename|
-  step '"ロードボタン" にフォーカスを移す'
-
+step ':field フィールドにファイル :filename を設定する' do |field, filename|
   # HACK: input#load-file[type="file"]は非表示要素であるため、.show()し
   #   ないと見つけられずattach_fileが失敗する
-  page.execute_script("$('#load-file').show()")
+  page.execute_script("$('##{field}').show()")
 
   path = Pathname(fixture_path).join(filename).to_s
   path.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if windows?
-  attach_file('load-file', path)
+  attach_file(field, path)
+end
+
+step ':filename をロードする' do |filename|
+  step '"ロードボタン" にフォーカスを移す'
+  step %{'load-file' フィールドにファイル '#{filename}' を設定する}
 end
 
 step 'ページをリロードする' do
@@ -199,11 +202,5 @@ end
 # rubocop:enable Eval
 
 step 'ページを表示する' do
-  # no-op
-end
-
-steps_for :debug do
-  step 'ページを表示する' do
-    save_and_open_page
-  end
+  save_and_open_page
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,20 +192,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts-as-taggable-on
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: smalruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +296,7 @@ files:
 - app/assets/javascripts/blocks/etc.js.coffee.erb
 - app/assets/javascripts/blocks/events.js.coffee.erb
 - app/assets/javascripts/blocks/field_character.js.coffee.erb
+- app/assets/javascripts/blocks/field_costume.js.coffee.erb
 - app/assets/javascripts/blocks/hardware.js.coffee.erb
 - app/assets/javascripts/blocks/looks.js.coffee.erb
 - app/assets/javascripts/blocks/motion.js.coffee.erb
@@ -303,7 +318,7 @@ files:
 - app/assets/javascripts/routers/.keep
 - app/assets/javascripts/smalruby.js.coffee.erb
 - app/assets/javascripts/views/.keep
-- app/assets/javascripts/views/character_modal_view.js.coffee
+- app/assets/javascripts/views/character_modal_view.js.coffee.erb
 - app/assets/javascripts/views/character_selector_view.js.coffee
 - app/assets/javascripts/views/load_modal_view.js.coffee.erb
 - app/assets/javascripts/views/main_menu_view.js.coffee.erb
@@ -319,11 +334,13 @@ files:
 - app/assets/templates/.keep
 - app/controllers/application_controller.rb
 - app/controllers/concerns/.keep
+- app/controllers/costumes_controller.rb
 - app/controllers/editor_controller.rb
 - app/controllers/sessions_controller.rb
 - app/controllers/source_codes_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/application_helper.rb
+- app/helpers/costumes_helper.rb
 - app/helpers/editor_helper.rb
 - app/helpers/sessions_helper.rb
 - app/helpers/users_helper.rb
@@ -355,6 +372,7 @@ files:
 - app/models/concerns/ruby_to_block/block/hardware_motor_driver.rb
 - app/models/concerns/ruby_to_block/block/hardware_motor_driver_set_speed.rb
 - app/models/concerns/ruby_to_block/block/hardware_motor_driver_speed.rb
+- app/models/concerns/ruby_to_block/block/hardware_neo_pixel_set_rgb.rb
 - app/models/concerns/ruby_to_block/block/hardware_operation.rb
 - app/models/concerns/ruby_to_block/block/hardware_rgb_led_set_color.rb
 - app/models/concerns/ruby_to_block/block/hardware_rgb_led_turn_off.rb
@@ -371,8 +389,10 @@ files:
 - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_set_speed.rb
 - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_speed.rb
 - app/models/concerns/ruby_to_block/block/looks_hide.rb
+- app/models/concerns/ruby_to_block/block/looks_next_costume.rb
 - app/models/concerns/ruby_to_block/block/looks_say.rb
 - app/models/concerns/ruby_to_block/block/looks_show.rb
+- app/models/concerns/ruby_to_block/block/looks_switch_costume.rb
 - app/models/concerns/ruby_to_block/block/looks_vanish.rb
 - app/models/concerns/ruby_to_block/block/math_number.rb
 - app/models/concerns/ruby_to_block/block/motion_change_x_by.rb
@@ -412,9 +432,11 @@ files:
 - app/models/concerns/ruby_to_block/block/value.rb
 - app/models/concerns/ruby_to_block/context.rb
 - app/models/concerns/ruby_to_block/formatter.rb
+- app/models/costume.rb
 - app/models/preference.rb
 - app/models/source_code.rb
 - app/models/user.rb
+- app/views/costumes/index.html.haml
 - app/views/editor/_block_tab.html.haml
 - app/views/editor/_character_modal.html.haml
 - app/views/editor/_load_modal.html.haml
@@ -464,6 +486,14 @@ files:
 - db/migrate/20131219045113_add_filename_to_source_code.rb
 - db/migrate/20150513061200_create_users.rb
 - db/migrate/20150513061250_add_index_name_on_users.rb
+- db/migrate/20150607012053_create_costumes.rb
+- db/migrate/20150607012707_add_indexes_on_costumes.rb
+- db/migrate/20150607034013_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
+- db/migrate/20150607034014_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+- db/migrate/20150607034015_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- db/migrate/20150607034016_add_missing_taggable_index.acts_as_taggable_on_engine.rb
+- db/migrate/20150607034017_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
+- db/migrate/20150607034018_insert_preset_costumes.rb
 - db/schema.rb
 - db/seeds.rb
 - demos/car_chase.rb.xml
@@ -483,10 +513,10 @@ files:
 - public/422.html
 - public/500.html
 - public/apple-touch-icon.png
-- public/assets/application-f411d2bebfcc93a4e8ac20b19af2fafd.js
-- public/assets/application-f411d2bebfcc93a4e8ac20b19af2fafd.js.gz
-- public/assets/application-f879948b97a781e3d996535a2a0585fa.css
-- public/assets/application-f879948b97a781e3d996535a2a0585fa.css.gz
+- public/assets/application-01ea22bf031b73863715417bd68b9cfa.css
+- public/assets/application-01ea22bf031b73863715417bd68b9cfa.css.gz
+- public/assets/application-10e7350b7f8e32535d954c6a53e6b2ff.js
+- public/assets/application-10e7350b7f8e32535d954c6a53e6b2ff.js.gz
 - public/assets/blockly/msg/js/en_us-d5e1938b2d57c1df954f4411b9165d10.js
 - public/assets/blockly/msg/js/en_us-d5e1938b2d57c1df954f4411b9165d10.js.gz
 - public/assets/blockly/msg/js/ja-16b694632120c3d1ace214702c6ea413.js
@@ -507,11 +537,11 @@ files:
 - public/assets/jquery-ui/ui-icons_888888_256x240-ce584ffa171c3ea9a018cf0d7bec65c8.png
 - public/assets/jquery-ui/ui-icons_cd0a0a_256x240-747e96029e8dedcabc224e5f7d1f2ede.png
 - public/assets/loading-e77296be32d066d3e29d3bf9803fa417.gif
-- public/assets/manifest-514520c20d8e98306b1bb2d0437f7575.json
-- public/assets/msg/en_us-a98cc83805d44f5f675fe6eac2c955ec.js
-- public/assets/msg/en_us-a98cc83805d44f5f675fe6eac2c955ec.js.gz
-- public/assets/msg/ja-243b0a55ef1086ef2180af94c422cb5e.js
-- public/assets/msg/ja-243b0a55ef1086ef2180af94c422cb5e.js.gz
+- public/assets/manifest-013a6df7ca7443586ce9a3614a33dd39.json
+- public/assets/msg/en_us-e54bdd84fc120684bed3fa16e2d3d7fa.js
+- public/assets/msg/en_us-e54bdd84fc120684bed3fa16e2d3d7fa.js.gz
+- public/assets/msg/ja-ada4923ec8028047541796bf2f31dd1c.js
+- public/assets/msg/ja-ada4923ec8028047541796bf2f31dd1c.js.gz
 - public/assets/progressbar-ee8fb1222f286f625bbf7332844a6a0c.gif
 - public/blockly/media/1x1.gif
 - public/blockly/media/anon.jpeg
@@ -588,6 +618,7 @@ files:
 - spec/acceptance/block_mode/blocks/hardware/led_turn_on.feature
 - spec/acceptance/block_mode/blocks/hardware/motor_driver.feature
 - spec/acceptance/block_mode/blocks/hardware/motor_driver_speed.feature
+- spec/acceptance/block_mode/blocks/hardware/neo_pixel_set_rgb.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_set_color.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_turn_off.feature
 - spec/acceptance/block_mode/blocks/hardware/sensor_value.feature
@@ -604,6 +635,7 @@ files:
 - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car.feature
 - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car_speed.feature
 - spec/acceptance/block_mode/blocks/looks/hide.feature
+- spec/acceptance/block_mode/blocks/looks/next_costume.feature
 - spec/acceptance/block_mode/blocks/looks/say.feature
 - spec/acceptance/block_mode/blocks/looks/show.feature
 - spec/acceptance/block_mode/blocks/looks/vanish.feature
@@ -644,6 +676,7 @@ files:
 - spec/acceptance/block_mode/blocks/sensing/reach_wall.feature
 - spec/acceptance/block_mode/blocks/sensing/time_now.feature
 - spec/acceptance/block_mode/blocks/sound/play.feature
+- spec/acceptance/block_mode/character_modal_view.feature
 - spec/acceptance/block_mode/demo.feature
 - spec/acceptance/block_mode/translate.feature
 - spec/acceptance/readme.md
@@ -661,6 +694,7 @@ files:
 - spec/fixtures/files/01_remix.rb
 - spec/fixtures/files/01_remix02.rb
 - spec/fixtures/files/01_remix10.rb.xml
+- spec/fixtures/files/extra_car.png
 - spec/fixtures/files/favicon.ico
 - spec/fixtures/files/hardware_led.rb.xml
 - spec/helpers/editor_helper_spec.rb
@@ -671,9 +705,11 @@ files:
 - spec/javascripts/spec_helper.js
 - spec/lib/smalruby_editor_spec.rb
 - spec/models/concerns/ruby_to_block/block/character_method_call_spec.rb
+- spec/models/concerns/ruby_to_block/block/character_spec.rb
 - spec/models/concerns/ruby_to_block/block/control_if_spec.rb
 - spec/models/concerns/ruby_to_block/block/control_loop_spec.rb
 - spec/models/concerns/ruby_to_block/block/events_on_start_spec.rb
+- spec/models/concerns/ruby_to_block/block/hardware__neo_pixel_spec.rb
 - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_spec.rb
 - spec/models/concerns/ruby_to_block/block/hardware_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb
@@ -767,6 +803,7 @@ test_files:
 - spec/acceptance/block_mode/blocks/hardware/led_turn_on.feature
 - spec/acceptance/block_mode/blocks/hardware/motor_driver.feature
 - spec/acceptance/block_mode/blocks/hardware/motor_driver_speed.feature
+- spec/acceptance/block_mode/blocks/hardware/neo_pixel_set_rgb.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_set_color.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_turn_off.feature
 - spec/acceptance/block_mode/blocks/hardware/sensor_value.feature
@@ -783,6 +820,7 @@ test_files:
 - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car.feature
 - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car_speed.feature
 - spec/acceptance/block_mode/blocks/looks/hide.feature
+- spec/acceptance/block_mode/blocks/looks/next_costume.feature
 - spec/acceptance/block_mode/blocks/looks/say.feature
 - spec/acceptance/block_mode/blocks/looks/show.feature
 - spec/acceptance/block_mode/blocks/looks/vanish.feature
@@ -823,6 +861,7 @@ test_files:
 - spec/acceptance/block_mode/blocks/sensing/reach_wall.feature
 - spec/acceptance/block_mode/blocks/sensing/time_now.feature
 - spec/acceptance/block_mode/blocks/sound/play.feature
+- spec/acceptance/block_mode/character_modal_view.feature
 - spec/acceptance/block_mode/demo.feature
 - spec/acceptance/block_mode/translate.feature
 - spec/acceptance/readme.md
@@ -840,6 +879,7 @@ test_files:
 - spec/fixtures/files/01_remix.rb
 - spec/fixtures/files/01_remix02.rb
 - spec/fixtures/files/01_remix10.rb.xml
+- spec/fixtures/files/extra_car.png
 - spec/fixtures/files/favicon.ico
 - spec/fixtures/files/hardware_led.rb.xml
 - spec/helpers/editor_helper_spec.rb
@@ -850,9 +890,11 @@ test_files:
 - spec/javascripts/spec_helper.js
 - spec/lib/smalruby_editor_spec.rb
 - spec/models/concerns/ruby_to_block/block/character_method_call_spec.rb
+- spec/models/concerns/ruby_to_block/block/character_spec.rb
 - spec/models/concerns/ruby_to_block/block/control_if_spec.rb
 - spec/models/concerns/ruby_to_block/block/control_loop_spec.rb
 - spec/models/concerns/ruby_to_block/block/events_on_start_spec.rb
+- spec/models/concerns/ruby_to_block/block/hardware__neo_pixel_spec.rb
 - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_spec.rb
 - spec/models/concerns/ruby_to_block/block/hardware_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb