kame-remocon 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3216ff980c9176d6f7bf355403ee8eaba8fea721487f87854d86903126224b53
-  data.tar.gz: 41a175c20d104a0ed9e700b44028c481829fa184b9168ebde2b2c896ed662036
+  metadata.gz: 589e5a727aa65644fbecd0b824c9c92ae23557c0307d59945e1212d63eb4a712
+  data.tar.gz: c4aec1813a7c3a94dc64d1c6d28bcfd94d6977b3c0fcb773d191c0a333fdc7a1
 SHA512:
-  metadata.gz: 62a1a85d0477903c931b35dd8fd85124d9fd7c15203f9a3e647842032b95fc7c2afb95bbdcde93b760f93759f738b766e70635690568b0b2486fbf0c89090c7a
-  data.tar.gz: 3f9b6bd5bfe892acabd3d0bed030f3f187a8718d65a15603df5883bb5af8f498f73013db78b8de8d36cd69b16bea0483e8150000b7979f1aa976cafeb8f853a7
+  metadata.gz: c595d82b0ce4810578f1898e1c048e1266d3d6ba840e0b4d4740e5734726c6bf5537e5ee2f5b0e37e0d865a188dc24b691dffdba7f9b97abb218af2dff4cc1e5
+  data.tar.gz: fbe5454e0841494ed808967d49d9ea4966a7e960ece8e90ce3c5eeb5606c7700bb304268b3885e7cf2d4c52ee49905b1466c0efcb0bf5c22c2d632cf4bbf9c52

data/lib/kame/app.rb

@@ -0,0 +1,60 @@
+require_relative "remocon/server"
+
+module Kame
+  module App
+    def self.start(context=nil)
+
+      remote_object = nil
+
+      app = Rack::Builder.app do
+        server = Kame::Remocon::Server.new(host: 'localhost')
+
+        remote_object = server.settings.remote_object
+
+        map '/' do
+          run server
+        end
+
+        map '/assets' do
+          run Kame::Remocon::Server::OPAL.sprockets
+        end
+      end
+
+      Thread.new do
+        thin = Rack::Handler.get('thin')
+        thin.run(DRb::WebSocket::RackApp.new(app), Host: "127.0.0.1", Port: 9292)
+      end.run
+
+      10.times do
+        sleep 2
+        if defined? Rack::Handler::Thin
+          Launchy.open("http://localhost:9292")
+          break
+        end
+      end
+
+      @remote_object = remote_object
+
+      print "Waiting for the client is up"
+
+      100.times do
+        if @remote_object.turtle
+          puts
+          commander = @remote_object.turtle.new_commander
+
+          if context
+            Commander::METHODS.each do |name|
+              context.define_singleton_method(name) do |*args|
+                commander.method_missing(name, *args)
+              end
+            end
+          end
+
+          break commander
+        end
+        print "."
+        sleep(1)
+      end
+    end
+  end
+end

data/lib/kame/remocon.rb

@@ -1,69 +1,17 @@
 require_relative "remocon/version"
 
-require "drb/websocket"
-require "launchy"
-
-require_relative "remocon/remote_object"
-require_relative "remocon/server"
-
-module Kame
-  module Remocon
-    class Error < StandardError; end
-  end
-
-  module App
-    def self.start(context=nil)
-      remote_object = nil
-
-      app = Rack::Builder.app do
-        server = Kame::Remocon::Server.new(host: 'localhost')
-
-        remote_object = server.settings.remote_object
-
-        map '/' do
-          run server
-        end
-
-        map '/assets' do
-          run Kame::Remocon::Server::OPAL.sprockets
-        end
-      end
-
-      Thread.new do
-        thin = Rack::Handler.get('thin')
-        thin.run(DRb::WebSocket::RackApp.new(app), Host: "127.0.0.1", Port: 9292)
-      end.run
-
-      10.times do
-        sleep 2
-        if defined? Rack::Handler::Thin
-          Launchy.open("http://localhost:9292")
-          break
-        end
-      end
-
-      @remote_object = remote_object
-
-      print "Waiting for the client is up"
-
-      100.times do
-        if @remote_object.turtle
-          puts
-          commander = @remote_object.turtle.new_commander
-
-          if context
-            Commander::METHODS.each do |name|
-              context.define_singleton_method(name) do |*args|
-                commander.method_missing(name, *args)
-              end
-            end
-          end
-          
-          break commander
-        end
-        print "."
-        sleep(1)
-      end
+if RUBY_ENGINE == "opal"
+  require_relative "remocon/opal/application"
+else
+  require "drb/websocket"
+  require "launchy"
+
+  require_relative "remocon/remote_object"
+  require_relative "app"
+
+  module Kame
+    module Remocon
+      class Error < StandardError; end
     end
   end
 end

data/lib/kame/remocon/opal/application.rb

@@ -0,0 +1,7 @@
+require 'hyalite'
+require "opal-parser"
+require "opal/drb"
+
+require_relative "kame_remocon"
+
+Hyalite.render(Hyalite.create_element(Kame::Remocon::Opal::AppView), $document['.content'])

data/lib/{opal → kame/remocon/opal}/canvas.rb

@@ -1,6 +1,6 @@
 require "native"
 
-class Canvas
+class Kame::Remocon::Opal::Canvas
   include Native
 
   native_accessor :width, :height

data/lib/{opal → kame/remocon/opal}/config.rb

@@ -1,4 +1,4 @@
-module Config
+module Kame::Remocon::Opal::Config
   def self.ws_enabled?
     `document.ws_enabled`
   end

data/lib/{opal → kame/remocon/opal}/image.rb

@@ -1,4 +1,4 @@
-class Image
+class Kame::Remocon::Opal::Image
   include Native
   include Native::Helpers
 

data/lib/kame/remocon/opal/kame_remocon.rb

@@ -0,0 +1,13 @@
+module Kame
+  module Remocon
+    module Opal
+    end
+  end
+end
+
+require_relative "config"
+require_relative "canvas"
+require_relative "turtle"
+require_relative "image"
+require_relative "views/app_view"
+require_relative "views/canvas_view"

data/lib/{opal → kame/remocon/opal}/turtle.rb

@@ -2,7 +2,7 @@ require "kame/remocon/commander"
 
 require_relative "./image"
 
-class Turtle
+class Kame::Remocon::Opal::Turtle
   attr_accessor :default_color
 
   class Pos
@@ -31,7 +31,7 @@ class Turtle
     clear
     reset
 
-    @kame = Image.new
+    @kame = Kame::Remocon::Opal::Image.new
     @kame.src = "/assets/images/kame.png"
   end
 
@@ -124,7 +124,7 @@ class Turtle
 
   def clear
     @context.clear_rect(0, 0, @canvas.width, @canvas.height)
-    @path = Canvas::Path2D.new
+    @path = Kame::Remocon::Opal::Canvas::Path2D.new
     @paths = [[@path, @default_color]]
     nil
   end

data/lib/{opal/application.rb → kame/remocon/opal/views/app_view.rb}

@@ -1,12 +1,3 @@
-require 'hyalite'
-require "opal-parser"
-require "opal/drb"
-
-require_relative "config"
-require_relative "views/canvas_view"
-require_relative "canvas"
-require_relative "turtle"
-
 =begin
 # n角形
 
@@ -23,7 +14,7 @@ n.times do
 end
 =end
 
-class AppView
+class Kame::Remocon::Opal::AppView
   include Hyalite::Component
 
   state :render_image, false
@@ -43,10 +34,10 @@ class AppView
   end
 
   def mounted(canvas)
-    @turtle = Turtle.new(canvas)
+    @turtle = Kame::Remocon::Opal::Turtle.new(canvas)
     @turtle.exec @program
 
-    if Config.ws_enabled?
+    if Kame::Remocon::Opal::Config.ws_enabled?
       @remote = DRb::DRbObject.new_with_uri "ws://127.0.0.1:9292"
       DRb.start_service("ws://127.0.0.1:9292/callback")
       @remote.set_turtle DRb::DRbObject.new(@turtle)
@@ -75,7 +66,7 @@ class AppView
     bg_color = @state[:bg_color]
     div do
       h2(nil, 'タートルグラフィックスに挑戦！！')
-      CanvasView.el(onMounted: -> canvas { mounted(canvas) }, render_image: render_image, bg_color: bg_color)
+      Kame::Remocon::Opal::CanvasView.el(onMounted: -> canvas { mounted(canvas) }, render_image: render_image, bg_color: bg_color)
       textarea({style: {width: "400px", height: "200px"}, ref: :program}, program)
       input({type: :checkbox, checked: true, id: :wait, ref: :wait})
       label({for: :wait}, "描く過程を表示する")
@@ -86,4 +77,3 @@ class AppView
     end
   end
 end
-Hyalite.render(Hyalite.create_element(AppView), $document['.content'])

data/lib/{opal → kame/remocon/opal}/views/canvas_view.rb

@@ -1,4 +1,4 @@
-class CanvasView
+class Kame::Remocon::Opal::CanvasView
   include Hyalite::Component
 
   def create_image
@@ -8,7 +8,7 @@ class CanvasView
 
   def component_did_mount
     el = @refs[:canvas]
-    @canvas = Canvas.new(el.native)
+    @canvas = Kame::Remocon::Opal::Canvas.new(el.native)
 
     @props[:onMounted].call(@canvas)
   end

data/lib/kame/remocon/server.rb

@@ -8,7 +8,7 @@ require 'opal/sprockets'
 
 class Kame::Remocon::Server < Sinatra::Base
   OPAL = Opal::Sprockets::Server.new do |server|
-    server.append_path File.expand_path("../../../opal", __FILE__)
+    server.append_path File.expand_path("../opal", __FILE__)
     server.append_path File.expand_path("../../../assets", __FILE__)
     #server.append_path File.expand_path("../../../", __FILE__)
     Opal.use_gem 'hyalite'
@@ -26,6 +26,7 @@ class Kame::Remocon::Server < Sinatra::Base
 
     remote_object = RemoteObject.new
     set :remote_object, remote_object
+    set :views, File.expand_path("../../../views", __FILE__)
 
     DRb::WebSocket::RackApp.config.use_rack = true
     DRb.start_service("ws://127.0.0.1:9292", remote_object)

data/lib/kame/remocon/version.rb

@@ -1,5 +1,5 @@
 module Kame
   module Remocon
-    VERSION = "0.1.6"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kame-remocon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: opal-drb
   requirement: !ruby/object:Gem::Requirement
@@ -187,20 +187,23 @@ extra_rdoc_files: []
 files:
 - lib/assets/css/application.scss
 - lib/assets/images/kame.png
+- lib/kame/app.rb
 - lib/kame/remocon.rb
 - lib/kame/remocon/commander.rb
+- lib/kame/remocon/opal/application.rb
+- lib/kame/remocon/opal/canvas.rb
+- lib/kame/remocon/opal/config.rb
+- lib/kame/remocon/opal/image.rb
+- lib/kame/remocon/opal/kame_remocon.rb
+- lib/kame/remocon/opal/turtle.rb
+- lib/kame/remocon/opal/views/app_view.rb
+- lib/kame/remocon/opal/views/canvas_view.rb
 - lib/kame/remocon/remote_object.rb
 - lib/kame/remocon/server.rb
 - lib/kame/remocon/turtle_proxy.rb
 - lib/kame/remocon/version.rb
-- lib/kame/remocon/views/index.haml
 - lib/kame_remocon.rb
-- lib/opal/application.rb
-- lib/opal/canvas.rb
-- lib/opal/config.rb
-- lib/opal/image.rb
-- lib/opal/turtle.rb
-- lib/opal/views/canvas_view.rb
+- lib/views/index.haml
 homepage: https://github.com/youchan/kame-remocon
 licenses:
 - MIT