cf3 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71a0ec8b28c1fd599073b44c0d22ae1522d505b7969a535edf3dfed706491ad
-  data.tar.gz: 36e50b4f45a4e77c6937e2e268f654c8563647045c44824c798cfb18879f3494
+  metadata.gz: cb9b632a3a5525bed8fd4b32f510abe90989add50b50ae31bfe5b60adef1c23b
+  data.tar.gz: 3ba5755cb4d30945ba2e320dbfea7b21c450e6b79b6915517553ad1e1a5e7f34
 SHA512:
-  metadata.gz: d7d53015eeaff4ffe3b5a641c29e1774ce02ed669f2b4447b2da66d6babbc03c58c48b9c69292bc10ba71895069bc03a22f078aaff1337a434f8a5384234d581
-  data.tar.gz: 4aca28d84f49c8f11bda4f028c20c8b9334eed0cab8259f3011129ff1f3c8e72d4dd4dcb67f7afc310e9525e1b36041d96dacb1a8b25d418d7fb81eda282c1ad
+  metadata.gz: 7dec9e31905d9748f19d32cd3c6905d053901dfa72754e88259ba29f6349251e6b9611be8d49834fa86ebbc9ebd0fd82c31ed91925a9e82ab27cb0813d895066
+  data.tar.gz: e57f11ec2c5e561294efe2c21d71efc22d3dd7259fa6d01c89c9a291f1fd7037774942d15ad96763926b8853a2ea77273f3f60f715a9a641ef11d50359848177

data/.gitignore

@@ -18,3 +18,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+docs/_site
+

data/{CHANGELOG → CHANGELOG.md}

@@ -1,6 +1,8 @@
-v1.0.0 About time for a regular release number, fixed and update some examples NB: see also https://github.com/funatsufumiya/cf3ruby_sketches
+v1.0.1 Created a website in docs folder (gemfile points to new website, that links to wiki and back to repo). Re-factored `class_eval` to `instance_eval` and added guards, somewhat simplifies code
 
-v0.0.7 Update for processing3 and JRubyArt by Funatsufumiya san (aka funniti)
+v1.0.0 About time for a regular release number, fixed and update some examples NB: see also [Funatsufumiya san sketches][funniti]
+
+v0.0.7 Update for processing3 and JRubyArt by Funatsufumiya san (aka [funniti][funniti])
 
 v0.0.6 Some tidy up remove @finished
 
@@ -21,3 +23,6 @@ v0.0.2 Second Gem Release
 v0.0.1. First Gem Release
   * very much base on jashkenas context-free.rb updated
   * for ruby-1.9 syntax (and DSL nearer to CF3 than the original cfdg)
+
+
+[funniti]:https://github.com/funatsufumiya/cf3ruby_sketches

data/bin/cf3samples

@@ -7,10 +7,10 @@
 home = ENV["HOME"]
 local = home + '/cf3work'
 file = __FILE__
-require "pathname" 
+require "pathname"
 require "fileutils"
 file = Pathname.new(file).realpath
 
 sample_dir = File.expand_path(File.dirname(file) + "/../samples")
-FileUtils.mkdir local unless Dir.exists? local
+FileUtils.mkdir local unless Dir.exist? local
 FileUtils.cp_r sample_dir, local

data/cf3ruby.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
     predict what you are going to get.
   EOF
   spec.summary       = %q{A ruby-DSL library for CF3 sketches}
-  spec.homepage      = 'http://learning-ruby-processing.blogspot.co.uk/'
+  spec.homepage      = "http://monkstone.github.io/cf3ruby/"
   spec.default_executable   = 'cf3samples'
   spec.licenses = %w(GPL-3.0 LGPL-2.0)
   spec.files         = `git ls-files`.split($/)

data/docs/README.md

@@ -0,0 +1 @@
+### Welcome to cf3ruby gem project

data/docs/_config.yml

@@ -0,0 +1,31 @@
+# Site settings
+port: 4000
+title: ContextFreeArt gem for JRubyArt
+email: mamba2928@yahoo.co.uk
+description: > # this means to ignore newlines until "baseurl:"
+  The cf3ruby gem is a kind of ruby DSL for contextfreeart. It is just a toy
+  really see https://www.contextfreeart.org/ for original.
+baseurl: "" # the subpath of your site, e.g. /blog
+regenerate: true
+url: "https://monkstone.github.io/cf3ruby"
+
+urls:
+  bugs: https://github.com/monkstone/cf3ruby/issues
+  github: https://github.com/monkstone/cf3ruby
+twitter_username: monkstoneT
+github_username:  monkstone
+
+theme: jekyll-theme-cayman
+
+syntax-highlighting:
+  enabled: true
+
+sass:
+  sass_dir: _sass
+
+# Build settings
+markdown: kramdown
+gems:
+  - jekyll-sitemap
+  - jekyll-feed
+  - jekyll-seo-tag

data/docs/about.md

@@ -0,0 +1,14 @@
+---
+layout: default
+title: Welcome to cf3ruby gem website
+permalink: /about/
+categories: jruby_art contextfreeart
+---
+The inspiration for cf3ruby is [contextfreeart][] and the jashkenas [original][], so what is context free art?
+
+Chris Coyne created a small language for design grammars called CFDG. These grammars are sets of non-deterministic rules to produce images. The images are surprisingly beautiful, often from very simple grammars.
+In the original version there were 3 terminals of a TRIANGLE, SQUARE and CIRCLE see cfdg [how_to][].
+
+[contextfreeart]:http://www.contextfreeart.org/
+[original]:https://github.com/jashkenas/context_free
+[how_to]:http://www.contextfreeart.org/mediawiki/index.php/CFDG_HOWTO

data/docs/example.md

@@ -0,0 +1,73 @@
+---
+layout: default
+title: A simple example with weighted shapes
+permalink: /example/
+categories: jruby_art contextfreeart
+---
+```ruby
+# city.rb after city.cfdg
+
+require 'cf3'
+
+def setup_the_city
+  @city = ContextFree.define do
+
+    shape :neighborhood do
+      split do
+        block x: -0.25, y: -0.25
+        rewind
+        block x: 0.25, y: -0.25
+        rewind
+        block x: 0.25, y: 0.25
+        rewind
+        block x: -0.25, y: 0.25
+      end
+    end
+
+    shape :block do
+      buildings size: 0.85
+    end
+
+    shape :block, 5 do
+      neighborhood size: 0.5, rotation: rand(-PI..PI), hue: rand(2), brightness: rand(0.75..1.75)
+    end
+
+    shape :block, 0.1 do
+      # Do nothing
+    end
+
+    shape :buildings do
+      square
+    end
+
+  end
+end
+
+def settings
+  size 600, 600
+end
+
+def setup
+  sketch_title 'City'
+  setup_the_city
+  @background = color 255, 255, 255
+  draw_it
+end
+
+def draw
+  # Do nothing
+end
+
+def draw_it
+  background @background
+  @city.render :neighborhood,
+               start_x: width/2, start_y: height/2,
+               size: height/2.5, color: [0.1, 0.1, 0.1]
+end
+
+def mouse_clicked
+  draw_it
+end
+
+
+```

data/docs/index.md

@@ -0,0 +1,10 @@
+---
+layout: default
+title: Welcome to cf3ruby gem website
+categories: jruby_art contextfreeart
+---
+
+### Example output
+[About]({{ site.github.url }}/about) [Example]({{ site.github.url }}/example) [Wiki](https://github.com/monkstone/cf3ruby/wiki)
+
+![y.png]({{ site.github.url }}/assets/y.png)

data/lib/cf3.rb

@@ -51,19 +51,17 @@ module Processing
       total = @rules[rule_name][:total]
       @rules[rule_name][:procs] << [(total...(prob + total)), proc]
       @rules[rule_name][:total] += prob
-      unless ContextFree.method_defined? rule_name
-        self.class.class_eval do
-          eval <<-METH
-            def #{rule_name}(options)
-              merge_options(@values, options)
-              pick = determine_rule(#{rule_name.inspect})
-              unless (@values[:size] - @values[:stop_size]) < 0
-                prepare_to_draw
-                pick[1].call(options)
-              end
-            end
-          METH
+      return if ContextFree.method_defined? rule_name
+      self.instance_eval do
+        eval <<-METH
+        def #{rule_name}(options)
+          merge_options(@values, options)
+          pick = determine_rule(#{rule_name.inspect})
+          return if (@values[:size] - @values[:stop_size]) < 0
+          prepare_to_draw
+          pick[1].call(options)
         end
+        METH
       end
     end
 

data/lib/cf3/version.rb

@@ -1,3 +1,3 @@
 module Cf3
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby_art
@@ -68,7 +68,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".yardopts"
-- CHANGELOG
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
@@ -76,6 +76,27 @@ files:
 - Rakefile
 - bin/cf3samples
 - cf3ruby.gemspec
+- docs/.sass-cache/cd612fe6616e7f514a2421dc73159618de35b85d/jekyll-theme-cayman.scssc
+- docs/.sass-cache/cd612fe6616e7f514a2421dc73159618de35b85d/normalize.scssc
+- docs/.sass-cache/cd612fe6616e7f514a2421dc73159618de35b85d/rouge-github.scssc
+- docs/.sass-cache/cd612fe6616e7f514a2421dc73159618de35b85d/variables.scssc
+- docs/README.md
+- docs/_config.yml
+- docs/_site/README.md
+- docs/_site/about/index.html
+- docs/_site/assets/css/style.css
+- docs/_site/assets/y.png
+- docs/_site/example/index.html
+- docs/_site/favicon.ico
+- docs/_site/feed.xml
+- docs/_site/index.html
+- docs/_site/robots.txt
+- docs/_site/sitemap.xml
+- docs/about.md
+- docs/assets/y.png
+- docs/example.md
+- docs/favicon.ico
+- docs/index.md
 - lib/cf3.rb
 - lib/cf3/version.rb
 - samples/Rakefile
@@ -103,7 +124,7 @@ files:
 - samples/xcross.rb
 - samples/y.rb
 - test/test_cf3.rb
-homepage: http://learning-ruby-processing.blogspot.co.uk/
+homepage: http://monkstone.github.io/cf3ruby/
 licenses:
 - GPL-3.0
 - LGPL-2.0
@@ -124,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A ruby-DSL library for CF3 sketches