furnace-xray 1.0.0 → 1.1.0.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ad3fbcd1c6346fa30c03fa890bd356da8440d602
+  data.tar.gz: ab2c38eee0ee6edaff32064341037e61874bb34f
+SHA512:
+  metadata.gz: 2b18eba9f93d570ddc9f9c40a4fead4b045c46088354666248b1eb87aa1ef835e3b919a030b5f59248a7b183703284f69b0c13b27a563181eb06b0c0bacb081d
+  data.tar.gz: b9cfcca32473c06a899459259a602028b322ed9db8c30ce43aea2a8d8697c3e63fa3b832d7d64679828dd0f5ba71ed2f329037c7df7d4fb656791853a732d4ed

data/README.md

@@ -47,6 +47,8 @@ To view collected data, just point furnace-xray to it:
 Now, open your ~~browser~~ Chrome or Chromium and point it to
 http://localhost:4567.
 
+![](http://f.cl.ly/items/2t0p052l1J1m283r2W2b/furnace-xray.png)
+
 ## Contributing
 
 1. Fork it

data/bin/furnace-xray

@@ -20,4 +20,4 @@ end
 
 Trollop::die "File not specified or does not exist" unless ARGV[0] && File.exist?(ARGV[0])
 
-Furnace::Xray::App.run! ARGV[0], :environment => :production
+Furnace::Xray::App.run! ARGV[0], :environment => :production

data/furnace-xray.gemspec

@@ -19,15 +19,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'trollop'
-  gem.add_dependency 'sprockets', '~> 2.0.0'
   gem.add_dependency 'sinatra'
-  gem.add_dependency 'sinatra-sprockets-ext'
+  gem.add_dependency 'trollop'
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'sprockets-vendor_gems'
-  gem.add_dependency 'haml'
-  gem.add_dependency 'sass'
-  gem.add_dependency 'sprockets-sass'
-  gem.add_dependency 'compass'
+
+  gem.add_dependency 'haml',                      '3.1.7'
+  gem.add_dependency 'sass',                      '3.2.5'
+  gem.add_dependency 'sprockets',                 '2.8.2'
+  gem.add_dependency 'sprockets-sass',            '0.9.1'
+  gem.add_dependency 'sprockets-helpers',         '0.8.0'
   gem.add_dependency 'coffee-script'
+  gem.add_dependency 'compass'
 end

data/lib/furnace-xray/app/app.rb

@@ -1,11 +1,10 @@
 require 'sinatra/base'
 
-require 'sprockets-vendor_gems/extend_all'
-require 'sinatra/sprockets'
-
 require 'haml'
-require 'sprockets-sass'
 require 'sass'
+require 'sprockets'
+require 'sprockets/sass'
+require 'sprockets/helpers'
 require 'compass'
 require 'coffee-script'
 
@@ -19,35 +18,29 @@ end
 module Furnace
   module Xray
     class App < Sinatra::Base
+      register Sinatra::JstPages
+
+      set :static, true
+      set :public_folder, File.expand_path('../public', __FILE__)
+      set :sprockets, Sprockets::Environment.new(root)
+      set :assets_types, %w(javascripts stylesheets images)
+
       def self.run!(file, options={})
         set :json_location, file
+        assets_types.map{|x| sprockets.append_path ("#{root}/assets/#{x}") }
         super options
       end
 
-      #
-      # Sprockets
-      #
-      register Sinatra::Sprockets
+      serve_jst '/jst.js'
+
       use Module.new {
         def self.new(app)
           Rack::Builder.new(app) do
-            map('/assets') { run Sinatra::Sprockets.environment }
+            map('/assets') { run App.sprockets }
           end
         end
       }
 
-      #
-      # JST
-      #
-      register Sinatra::JstPages
-      serve_jst '/jst.js'
-
-      #
-      # App
-      #
-      enable :static
-      set :public_folder, File.expand_path('../public', __FILE__)
-
       get '/' do
         haml :index
       end

data/lib/furnace-xray/app/assets/javascripts/lib/input.js.coffee

@@ -14,14 +14,14 @@ class @Input
     transforms = Object.extended()
 
     @source.events.each (x, i) =>
-      switch x.event 
+      switch x.event
         when 'addInstruction'
           reducer.add x.name
           @events.add i
         when 'removeInstruction'
           reducer.exclude x.name
           @events.add i
-        when 'updateInstruction'
+        when 'updateInstruction', 'renameInstruction'
           @events.add i if reducer.any(x.name)
         when 'type', 'transformStart'
         else
@@ -32,7 +32,7 @@ class @Input
         transforms[id] = {id: id, label: x.name}
 
     @transforms = transforms.values()
-    @transforms = @transforms.filter (x, i) => 
+    @transforms = @transforms.filter (x, i) =>
       x.length = (@transforms[i+1]?.id || @events.length) - x.id
       x.id < @events.length-1
 
@@ -60,7 +60,7 @@ class @Input
     else
       @previousState = new InputState(@)
 
-    @reset() 
+    @reset()
     @increment(to)
 
   increment: (to) ->
@@ -123,7 +123,7 @@ class @Input
     @instructions[id].update event.opcode, event.name, event.parameters, operands, @type(event.type)
 
   addInstruction: (event) ->
-    @instructionsMap.locate event.name, (i) =>
+    @instructionsMap.locateOrAdd event.name, (i) =>
       @blocksMap.locate event.basic_block, (b) =>
         @instructions[i].link @blocks[b], event.index
 
@@ -131,4 +131,8 @@ class @Input
     @instructionsMap.locate event.name, (i) =>
       @instructions[i].unlink()
 
-  transformStart: (event) ->
+  renameInstruction: (event) ->
+    @instructionsMap.rename event.name, event.new_name, (i) =>
+      @instructions[i].name = event.new_name
+
+  transformStart: (event) ->

data/lib/furnace-xray/app/assets/javascripts/lib/map.js.coffee

@@ -9,9 +9,9 @@ class @Map
   each: (block) -> @map.each block
 
   add: (name, block) ->
-    id = @data.findIndex(name)
+    id = @map[name]
 
-    if id < 0
+    unless id?
       @data.add name
       id = @data.length-1
       block(id) if block
@@ -22,7 +22,7 @@ class @Map
   find: (name) ->
     id = @map[name]
 
-    if id < 0 
+    unless id?
       error = "Map '#{@title}': '#{name}' element not found"
       throw error
 
@@ -42,4 +42,7 @@ class @Map
     @map[newName] = id
 
   locate: (name, block) ->
-    block(@find(name))
+    block(@find(name))
+
+  locateOrAdd: (name, block) ->
+    block(@add(name))

data/lib/furnace-xray/app/views/index.haml

@@ -5,9 +5,10 @@
 
     %link{:href => "data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=", :rel => "icon", :type => "image/x-icon"}
 
-    = javascript_include_tag 'application'
-    = javascript_include_tag '/jst'
-    = stylesheet_link_tag 'app'
+    %link{:href => '/assets/app.css', :rel => 'stylesheet', :type => 'text/css'}
+
+    %script{:src => '/assets/application.js', :type => 'text/javascript'}
+    %script{:src => '/jst.js', :type => 'text/javascript'}
 
     :javascript
       window.data = Input.normalize(#{File.read settings.json_location})

data/lib/furnace-xray/version.rb

@@ -1,5 +1,5 @@
 module Furnace
   module Xray
-    VERSION = '1.0.0'
+    VERSION = '1.1.0.pre1'
   end
 end

metadata

@@ -1,137 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: furnace-xray
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0.pre1
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: &70220406738380 !ruby/object:Gem::Requirement
-    none: false
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220406738380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: &70220406737540 !ruby/object:Gem::Requirement
-    none: false
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220406737540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70220406737020 !ruby/object:Gem::Requirement
-    none: false
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220406737020
-- !ruby/object:Gem::Dependency
-  name: sinatra-sprockets-ext
-  requirement: &70220406736100 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70220406736100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70220406735100 !ruby/object:Gem::Requirement
-    none: false
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70220406735100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
-  name: sprockets-vendor_gems
-  requirement: &70220406734200 !ruby/object:Gem::Requirement
-    none: false
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70220406734200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70220406733660 !ruby/object:Gem::Requirement
-    none: false
+  name: sprockets-sass
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70220406733660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &70220406733100 !ruby/object:Gem::Requirement
-    none: false
+  name: sprockets-helpers
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220406733100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: sprockets-sass
-  requirement: &70220406731920 !ruby/object:Gem::Requirement
-    none: false
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220406731920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70220406730900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220406730900
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: &70220406752600 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70220406752600
 description: A visualizer for transformations of code in Static Single Assignment
   form based on the Furnace library.
 email:
@@ -224,27 +242,26 @@ files:
 - sample.json
 homepage: https://github.com/evilmartians/furnace-xray
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A visualizer for transformations of code in Static Single Assignment form
   based on the Furnace library.
 test_files: []