fml 0.2.1 → 0.2.2

data/bin/fml2dae.rb

@@ -10,6 +10,6 @@ else
     ARGV.shift
     xrefs = true
   end
-  doc = Floorplanner::Document.new(ARGV[0])
-  doc.to_dae(ARGV[1],xrefs)
+  doc = Floorplanner::Document.new(ARGV[1])
+  doc.to_dae(ARGV[0],ARGV[2],xrefs)
 end

data/fml.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name    = "fml"
-  s.version = "0.2.1"
-  s.date    = "2009-09-23"
+  s.version = "0.2.2"
+  s.date    = "2010-04-26"
   
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.0") if s.respond_to? :required_rubygems_version=
   

data/lib/config.yml

@@ -2,8 +2,6 @@ content_base_url: http://cdn.floorplanner.com/assets/
 dae_cache_path: /home/skrat/workspace/floorplanner/fml2dae_cache/
 area_textures_path: /home/skrat/workspace/floorplanner/fml2dae_cache/textures_2d/
 
-wall_height: 2.2
-wall_thickness: 0.25
 geom_snap:  0.1
 uniq_snap:  0.0000005
 openings:

data/lib/floorplanner.rb

@@ -4,7 +4,6 @@ require 'find'
 require 'open-uri'
 require 'net/http'
 require 'fileutils'
-require 'logger'
 
 require 'rubygems'
 require 'zip/zip'
@@ -13,11 +12,6 @@ require 'xml'
 $LOAD_PATH.push(File.dirname(__FILE__))
 
 module Floorplanner
-
-  Log = Logger.new STDOUT
-  Log.level = Logger::WARN
-  Log.datetime_format = "%Y-%m-%d %H:%M:%S "
-
   def self.config
     @@config ||= YAML.load_file(File.join(File.dirname(__FILE__),'config.yml'))
   end

data/lib/floorplanner/asset.rb

@@ -19,11 +19,11 @@ module Floorplanner
 
       cached_path = File.join(CACHE_PATH,asset_id)
       if File.exists?(cached_path)
-        Log.info "Cached asset: #{asset_id}"
+        $stderr.puts("Cached asset: %s" % asset_id)
         @kmz = Keyhole::Archive.new(cached_path)
         Asset.new(asset_id,asset_title,@kmz)
       else
-        Log.info "Downloading asset: #{asset_url}"
+        $stderr.puts("Downloading asset: %s" % asset_url)
         cached = File.new(cached_path,'w')
         remote = open(asset_url)
         cached.write(remote.read)

data/lib/floorplanner/collada_export.rb

@@ -1,8 +1,8 @@
 module Floorplanner
   class Document
 
-    def to_dae(out_path,xrefs=false)
-      @design = Design.new(@xml)
+    def to_dae(design_id,out_path,xrefs=false)
+      @design = Design.new(@xml,design_id)
       @design.build_geometries
       @design.save_textures(File.dirname(out_path)) unless xrefs
       dae = File.new(out_path,'w')
@@ -13,7 +13,7 @@ module Floorplanner
   end
 
   module ColladaExport
-    DESIGN_QUERY   = "/design"
+    DESIGN_QUERY   = "/project/floors/floor/designs/design[id='%s']"
     ASSET_QUERY    = DESIGN_QUERY+"/assets/asset[@id='%s']"
     ASSETS_QUERY   = DESIGN_QUERY+"/assets/asset"
     OBJECTS_QUERY  = DESIGN_QUERY+"/objects/object"
@@ -37,7 +37,7 @@ module Floorplanner
     def assets
       return @assets if @assets
       @assets = {}
-      @xml.find(ASSETS_QUERY).each do |asset_node|
+      @xml.find(ASSETS_QUERY % @design_id).each do |asset_node|
         asset_id = asset_node.attributes['id']
         name  = asset_node.find('name').first.content
         url3d = asset_node.find('url3d').first
@@ -54,7 +54,7 @@ module Floorplanner
 
     def objects
       result = []
-      @xml.find(OBJECTS_QUERY).each do |object|
+      @xml.find(OBJECTS_QUERY % @design_id).each do |object|
         begin
           refid = object.find('asset').first.attributes['refid']
           next unless assets[refid]

data/lib/floorplanner/design.rb

@@ -1,6 +1,7 @@
 module Floorplanner
   class Design
-    DESIGN_QUERY   = "/design"
+    DESIGN_QUERY   = "/project/floors/floor/designs/design[id='%s']"
+    DESIGN_N_QUERY = "/project/floors/floor/designs/design[name='%s']"
     ASSET_QUERY    = DESIGN_QUERY+"/assets/asset[@id='%s']"
     ASSET_URL2D    = ASSET_QUERY+"/url2d"
     LINES_QUERY    = DESIGN_QUERY+"/lines/line"
@@ -16,13 +17,18 @@ module Floorplanner
     ##
     # Constructs new floorplan design from FML
     ##
-    def initialize(fml)
+    def initialize(fml,design_id)
       begin
         @xml = fml
-        @name   = @xml.find(NAME_QUERY).first.content
+        unless fml.find(DESIGN_QUERY % design_id).length.zero?
+          @design_id = design_id
+        else
+          @design_id = fml.find(DESIGN_N_QUERY % design_id).first.find("id").first.content
+        end
+        @name   = @xml.find(NAME_QUERY % @design_id).first.content
         @author = "John Doe" # TODO from <author> element if included in FML
       rescue NoMethodError
-        Log.error "Can't load FML"
+        $stderr.puts "Can't find Design with ID or name: %s" % design_id
       end
     end
 
@@ -31,18 +37,13 @@ module Floorplanner
     ##
     def build_geometries
       @areas = AreaBuilder.new do |b|
-        @xml.find(AREAS_QUERY).each do |area|
-          name  = area.find('name').first
-          name  = name.content if name
-          color = area.find('color').first
-          color = color.content if color
+        @xml.find(AREAS_QUERY % @design_id).each do |area|
+          name  = area.find('name').first.content
+          color = area.find('color').first.content
           type  = area.find('type').first.content
 
-          asset_id = area.find('asset').first
-          asset_id = asset_id.attributes['refid'] if asset_id
-          if asset_id
-            texture_url = @xml.find(ASSET_URL2D % [asset_id]).first.content
-          end
+          asset_id = area.find('asset').first.attributes['refid']
+          texture_url = @xml.find(ASSET_URL2D % [@design_id,asset_id]).first.content
 
           vertices = Array.new
           area.find('points').first.content.split(',').each do |str_v|
@@ -65,13 +66,11 @@ module Floorplanner
       end
       min_height = 10
       @walls = WallBuilder.new do |b|
-        @xml.find(LINES_QUERY).each do |line|
+        @xml.find(LINES_QUERY % @design_id).each do |line|
           floats = line.find('points').first.get_floats
 
-          thickness = line.find('thickness').first
-          thickness = thickness ? thickness.content.to_f : Floorplanner.config['wall_thickness']
-          height = line.find('height').first
-          height = height ? height.content.to_f : Floorplanner.config['wall_height']
+          thickness = line.find('thickness').first.content.to_f
+          height = line.find('height').first.content.to_f
 
           # TODO: fix this in Flash app
           floats[1] *= -1.0; floats[4] *= -1.0
@@ -87,7 +86,7 @@ module Floorplanner
       @areas.update min_height
 
       @walls.prepare
-      @xml.find(OPENINGS_QUERY).each do |opening|
+      @xml.find(OPENINGS_QUERY % @design_id).each do |opening|
         pos_floats  = opening.find('points').first.get_floats
 
         # TODO: fix y coord in Flash app
@@ -98,7 +97,7 @@ module Floorplanner
         size     = Geom::Number3D.new(*size_floats)
 
         asset_id = opening.find('asset').first.attributes['refid']
-        asset    = @xml.find(ASSET_QUERY % [asset_id]).first
+        asset    = @xml.find(ASSET_QUERY % [@design_id,asset_id]).first
         type     = asset.find('url2d').first.content.match(/door/i) ? Opening3D::TYPE_DOOR : Opening3D::TYPE_WINDOW
         @walls.opening(position,size,type)
       end

data/lib/floorplanner/document.rb

@@ -1,7 +1,6 @@
 module Floorplanner
 
   class Document
-
     POINTS_QUERY = "/project/floors/floor/designs/design/area/line/points"
     LINE_POINTS_REGEXP = /^((\s*[-+]?[0-9]*\.?[0-9]+\s+){5,8}\s*[-+]?[0-9]*\.?[0-9]+\s*?(?:,)?)*$/
 
@@ -10,11 +9,11 @@ module Floorplanner
     end
 
     def self.validate(doc)
-      schema = XML::Schema.document(
-        XML::Document.file(File.join(File.dirname(__FILE__), "..", "..", "xml", "fml-permissive.xsd"))
+      schema = XML::RelaxNG.document(
+        XML::Document.file(File.join(File.dirname(__FILE__), "..", "..", "xml", "fml.rng"))
       )
       doc = XML::Document.file(doc) if doc.instance_of?(String)
-      doc.validate_schema(schema) do |message,error|
+      doc.validate_relaxng(schema) do |message,error|
         # TODO throw an exception
         puts message if error
       end
@@ -34,8 +33,16 @@ module Floorplanner
 
   class DesignDocument
 
-    def initialize(fml_fn)
-      @xml = LibXML::XML::Document.file(fml_fn)
+    def initialize(fml)
+      if fml.kind_of? String # filename
+        @xml = XML::Document.file(fml)
+      elsif fml.kind_of? XML::Document
+        @xml = fml
+      elsif fml.respond_to?(:read) # IO
+        @xml = XML::Document.io(fml)
+      else
+        raise ArgumentError.new("values must be one of: filename, IO, XML::Document")
+      end
     end
 
     def update_heights(new_height)
@@ -60,8 +67,28 @@ module Floorplanner
       end
     end
 
-    def save(fn)
-      @xml.save fn
+    def update_thumb_2d_url(thumb_2d_url)
+      if thumb_node = @xml.find_first('/design/thumb-2d-url')
+        thumb_node.content = thumb_2d_url
+      elsif design_node = @xml.find_first('/design')
+        thumb_node = XML::Node.new('thumb-2d-url')
+        thumb_node.content = thumb_2d_url
+        design_node << thumb_node
+      else
+        raise "Cannot update the 2D thumb URL!"
+      end
+    end
+
+    def save(path)
+      @xml.save path
+    end
+
+    def to_xml
+      @xml
+    end
+
+    def to_s
+      @xml.to_s
     end
   end
 

data/lib/floorplanner/wall_builder.rb

@@ -111,7 +111,7 @@ module Floorplanner
         @faces.concat(wall.faces)
       end
 
-      Log.info "Walls Vertices before: #{@vertices.length.to_s}"
+      $stderr.puts "Walls Vertices before: #{@vertices.length.to_s}"
       # remove same instances
       @vertices.uniq!
       # remove same vertices
@@ -120,8 +120,8 @@ module Floorplanner
       old.each do |v|
         @vertices.push(v) unless @vertices.include?(v) # find_vertex(@vertices,v) #
       end
-      Log.info "Walls Vertices: #{@vertices.length.to_s}"
-      Log.info "Walls Faces   : #{@faces.length.to_s}"
+      $stderr.puts "Walls Vertices: #{@vertices.length.to_s}"
+      $stderr.puts "Walls Faces   : #{@faces.length.to_s}"
     end
 
     # make use of cache

data/tasks/github-gem.rake

@@ -119,19 +119,20 @@ module GithubGem
         checks = [:check_current_branch, :check_clean_status, :check_not_diverged, :check_version]
         checks.unshift('spec:basic') if has_specs?
         checks.unshift('test:basic') if has_tests?
-        checks.push << [:check_rubyforge] if gemspec.rubyforge_project
+        # checks.push << [:check_rubyforge] if gemspec.rubyforge_project
 
         desc "Perform all checks that would occur before a release"
         task(:release_checks => checks)
 
-        release_tasks = [:release_checks, :set_version, :build, :github_release]
-        release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
+        release_tasks = [:release_checks, :set_version, :build, :github_release, :gemcutter_release]
+        # release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
 
         desc "Release a new verison of the gem"
         task(:release => release_tasks) { release_task }
 
-        task(:check_rubyforge)   { check_rubyforge_task }
-        task(:rubyforge_release) { rubyforge_release_task }
+        # task(:check_rubyforge)   { check_rubyforge_task }
+        # task(:rubyforge_release) { rubyforge_release_task }
+        task(:gemcutter_release) { gemcutter_release_task }
         task(:github_release => [:commit_modified_files, :tag_version]) { github_release_task }
         task(:tag_version) { tag_version_task }
         task(:commit_modified_files) { commit_modified_files_task }
@@ -179,7 +180,7 @@ module GithubGem
 
     # Checks whether the current branch is not diverged from the remote branch
     def check_not_diverged_task
-      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.branches["#{remote}/#{remote_branch}"].gcommit).any?
+      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.remote(remote).branch(remote_branch).gcommit).any?
     end
 
     # Checks whether the repository status ic clean
@@ -215,18 +216,22 @@ module GithubGem
       git.push(remote, remote_branch, true)
     end
 
-    # Checks whether Rubyforge is configured properly
-    def check_rubyforge_task
-      # Login no longer necessary when using rubyforge 2.0.0 gem
-      # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
-      output = `rubyforge names`.split("\n")
-      raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
-      raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
-    end
-
-    # Task to release the .gem file toRubyforge.
-    def rubyforge_release_task
-      sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
+    # # Checks whether Rubyforge is configured properly
+    # def check_rubyforge_task
+    #   # Login no longer necessary when using rubyforge 2.0.0 gem
+    #   # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
+    #   output = `rubyforge names`.split("\n")
+    #   raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
+    #   raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
+    # end
+
+    # # Task to release the .gem file toRubyforge.
+    # def rubyforge_release_task
+    #   sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
+    # end
+    
+    def gemcutter_release_task
+      sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
     # Gem release task.
@@ -308,7 +313,15 @@ module GithubGem
         response = http.get(path)
         open(__FILE__, "w") { |file| file.write(response.body) }
       end
-      puts "Updated gem release tasks file with latest version."
+
+      relative_file = File.expand_path(__FILE__).sub(%r[^#{git.dir.path}/], '')
+      if git.status[relative_file] && git.status[relative_file].type == 'M'
+        git.add(relative_file)
+        git.commit("Updated to latest gem release management tasks.")
+        puts "Updated to latest version of gem release management tasks."
+      else
+        puts "Release managament tasks already are at the latest version."
+      end
     end
 
   end

data/views/design.dae.erb

@@ -16,6 +16,8 @@
         <technique_common>
           <perspective>
             <yfov>70</yfov>
+            <znear>0.1</znear>
+            <zfar>100.0</zfar>
           </perspective>
         </technique_common>
       </optics>
@@ -334,6 +336,7 @@
             <resolution>800 600</resolution>
             <aa>0 2</aa>
             <filter>gaussian</filter>
+            <sampler>ipr</sampler>
           </image>
           <trace_depths>
             <diffuse>4</diffuse>
@@ -346,25 +349,22 @@
             <samples>64</samples>
             <maxdist>3.0 </maxdist>
           </gi>
-          <background>
-            <color>1.0 1.0 1.0</color>
-          </background>
-          <!--sunsky>
+          <sunsky>
             <up>0 0 1</up>
             <east>1 0 0</east>
             <sundir>0.2 0.4 0.7</sundir>
             <ground>1 1 1</ground>
-          </sunsky-->
+          </sunsky>
         </technique>
       </extra>
-      <!--node id="Camera" name="Camera">
+      <node id="Camera" name="Camera">
         <lookat>
           9.0 -1.0 1.4
           8.0 -2.0 1.4
           0.0 0.0 1.0
         </lookat>
         <instance_camera url="#main-cam"/>
-      </node-->
+      </node>
       <node id="Walls" name="Walls">
         <instance_geometry url="#walls-geom">
           <bind_material>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fml
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Dusan Maliarik
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 +02:00
+date: 2010-04-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rubyzip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Floor plan document toolkit
 email: dusan.maliarik@gmail.com
 executables: 
@@ -98,18 +107,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 0
       version: 1.3.0
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Floorplanner.com FML document toolkit