gisture 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204135cbcc13305754d2b3a0558222ec220eae6b
-  data.tar.gz: 068ea799d72c1678747b1cef3a7c93a48a2ebd5d
+  metadata.gz: 03e7d1d1abd295d696f903a9017625ef7f4523f0
+  data.tar.gz: 4e7d8c8ddb6570ff3b8c1f366f791701e0640bdc
 SHA512:
-  metadata.gz: b53b53175b706be880fae8e9e32609edae8909bcc6dc3d3076a698c1f6e05b3463402ce7958fcc578f5bd48e9830a386d666546f60643f8424a52788c83263b0
-  data.tar.gz: 2e8a7e5565c63d09cb28ec6df0e229c399f0836b33a5a7c14f2286509e57adde000845d35947ed6183fec3e80b6476d07147ccf99f5ea51e5d9609d3b2eed435
+  metadata.gz: f1e213b93a08f3c3a552e28e8fb9900a7f504c5bdd1de7265901a8480dd8d869a85f2f6132bcf42cdd1ec88a85013c69d50da5f0fa91bc311a7f30e579990dc5
+  data.tar.gz: 8f9244489caba893887c4ecac9352b881e75f1b241c9a7c858cf3d41e8ad0a439dbf926d2dc3eaf7d8352e111b1148c7ae22549e1c2bf443432d796524cba5ea

data/lib/gisture/file.rb

@@ -0,0 +1,55 @@
+require 'tempfile'
+
+module Gisture
+  class File
+    attr_reader :file, :basename
+
+    def require!(&block)
+      required = require tempfile.path
+      unlink_tempfile
+      block_given? ? yield : required
+    end
+
+    def load!(&block)
+      loaded = load tempfile.path
+      unlink_tempfile
+      block_given? ? yield : loaded
+    end
+
+    def eval!(&block)
+      clean_room = Evaluator.new(content)
+      clean_room.instance_eval &block if block_given?
+      clean_room
+    end
+
+    def tempfile
+      @tempfile ||= begin
+        file = Tempfile.new([basename, filename, ::File.extname(filename)].compact, Gisture.configuration.tmpdir)
+        file.write(content)
+        file.close
+        file
+      end
+    end
+
+    def unlink_tempfile
+      tempfile.unlink
+      @tempfile = nil
+    end
+
+    def method_missing(meth, *args, &block)
+      return file.send(meth, *args, &block) if file.respond_to?(meth)
+      super
+    end
+
+    def respond_to_missing?(meth, include_private=false)
+      file.respond_to?(meth, include_private)
+    end
+
+    protected
+
+    def initialize(file, basename=nil)
+      @file = file
+      @basename = basename
+    end
+  end
+end

data/lib/gisture/gist.rb

@@ -1,5 +1,3 @@
-require 'tempfile'
-
 module Gisture
   class Gist
     attr_reader :filename, :gist_id, :strategy, :version
@@ -17,21 +15,15 @@ module Gisture
     end
 
     def require!(&block)
-      required = require tempfile.path
-      unlink_tempfile
-      block_given? ? yield : required
+      file.require! &block
     end
 
     def load!(&block)
-      loaded = load tempfile.path
-      unlink_tempfile
-      block_given? ? yield : loaded
+      file.load! &block
     end
 
     def eval!(&block)
-      clean_room = Evaluator.new(raw)
-      clean_room.instance_eval &block if block_given?
-      clean_room
+      file.eval! &block
     end
 
     def github
@@ -51,24 +43,18 @@ module Gisture
       end
     end
 
-    def gist_file
-      return @gist_file unless @gist_file.nil?
+    def file
+      return @file unless @file.nil?
 
       if gist.files.count > 1
         raise ArgumentError, "You must specify a filename if your gist contains more than one file" if filename.nil?
-        gist.files.each do |file|
-          @gist_file = file if file[0] == filename
-        end
-        raise ArgumentError, "The filename '#{filename}' was not found in the list of files for the gist '#{gist_id}'" if @gist_file.nil?
+        @file = Gisture::File.new(gist.files[filename], gist_id)
+        raise ArgumentError, "The filename '#{filename}' was not found in the list of files for the gist '#{gist_id}'" if @file.nil?
       else
-        @gist_file = gist.files.first
+        @file = Gisture::File.new(gist.files.first[1], gist_id)
       end
 
-      @gist_file
-    end
-
-    def raw
-      gist_file[1].content
+      @file
     end
 
     def strategy=(strat)
@@ -76,15 +62,6 @@ module Gisture
       @strategy = strat.to_sym
     end
 
-    def tempfile
-      @tempfile ||= begin
-        file = Tempfile.new([gist_id, File.extname(gist_file[0])], Gisture.configuration.tmpdir)
-        file.write(raw)
-        file.close
-        file
-      end
-    end
-
     def to_h
       { gist_id: gist_id,
         version: version,
@@ -95,7 +72,7 @@ module Gisture
     protected
 
     def initialize(gist, strategy: nil, filename: nil, version: nil)
-      self.strategy = strategy || :eval
+      self.strategy = strategy || Gisture.configuration.strategy
       @filename = filename
 
       if gist.match(/[^a-f0-9]+/i) # non-hex chars, probably a URL
@@ -108,11 +85,6 @@ module Gisture
 
     end
 
-    def unlink_tempfile
-      tempfile.unlink
-      @tempfile = nil
-    end
-
     def parse_gist_url(gist_url)
       case gist_url.to_s
       when GIST_URL_WITH_VERSION_REGEX

data/lib/gisture/railtie.rb

@@ -1,7 +1,7 @@
 module Gisture
   class Railtie < Rails::Railtie
     rake_tasks do
-      Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+      Dir[::File.join(::File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
     end
   end
 end

data/lib/gisture/version.rb

@@ -1,3 +1,3 @@
 module Gisture
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/gisture.rb

@@ -3,6 +3,7 @@ require 'github_api'
 require 'gisture/github_api/client/gists'
 require 'gisture/version'
 require 'gisture/evaluator'
+require 'gisture/file'
 require 'gisture/gist'
 require 'gisture/railtie' if defined?(Rails)
 
@@ -20,6 +21,7 @@ module Gisture
     config.user           = nil # global user used in requets if none provided
     config.org            = nil # global organization used in request if none provided
 
+    config.strategy       = :eval       # default execution strategy
     config.tmpdir         = Dir.tmpdir  # location to store gist tempfiles
   end
 

data/spec/gisture/file_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+RSpec.describe Gisture::Gist do
+  subject { Gisture::File.new(Gisture::Gist.new(TEST_GIST_ID).gist.files.first[1], TEST_GIST_ID) }
+
+  it "delegates missing methods to the file hash" do
+    expect(subject.respond_to?(:content)).to be_true
+    expect(subject.respond_to?(:filename)).to be_true
+  end
+
+  describe "#tempfile" do
+    it "creates and returns a tempfile" do
+      expect(subject.tempfile).to be_a(Tempfile)
+    end
+
+    it "uses the gist_id as the base of the filename" do
+      matched = ::File.basename(subject.tempfile.path).match(/#{TEST_GIST_ID}/)
+      expect(matched).to_not be_nil
+    end
+
+    it "uses the same extension as the gist's filename" do
+      expect(::File.extname(subject.tempfile.path)).to eql(::File.extname(subject.file.filename))
+    end
+
+    it "creates the file in the configured tempdir" do
+      tmp_path = ::File.join(::File.dirname(__FILE__), '../', 'tmp')
+      begin
+        FileUtils.mkdir_p tmp_path
+        Gisture.configure do |config|
+          config.tmpdir = tmp_path
+        end
+
+        expect(::File.dirname(subject.tempfile.path)).to eql(tmp_path)
+      rescue => e
+        raise e
+      ensure
+        Gisture.configure do |config|
+          config.tmpdir = Dir.tmpdir
+        end
+        FileUtils.rm_rf tmp_path
+      end
+    end
+  end
+end

data/spec/gisture/gist_spec.rb

@@ -1,13 +1,5 @@
 require "spec_helper"
 
-TEST_GIST_ID = "520b474ea0248d1a0a74"
-TEST_GIST_URL = "https://gist.github.com/markrebec/520b474ea0248d1a0a74"
-TEST_GIST_VERSION = "49a9d887eeb8c723ab23deddfbbb75d4b70e8014"
-TEST_GIST_VERSION_URL = "https://gist.github.com/markrebec/520b474ea0248d1a0a74/49a9d887eeb8c723ab23deddfbbb75d4b70e8014"
-TEST_GIST_FILENAME = "test.rb"
-MULTI_FILE_TEST_GIST_ID = "0417bf78a7c2b825b4ef"
-MULTI_FILE_TEST_GIST_FILENAMES = ['file_one.rb', 'file_two.rb']
-
 RSpec.describe Gisture::Gist do
   context "when passing a gist ID" do
     it "sets the gist ID as the gist_id" do
@@ -87,20 +79,14 @@ RSpec.describe Gisture::Gist do
     end
   end
 
-  describe "#gist_file" do
-    it "returns an array" do
-      expect(Gisture::Gist.new(TEST_GIST_ID).gist_file).to be_a(Array)
-    end
-
-    it "contains the filename and file object" do
-      gist = Gisture::Gist.new(TEST_GIST_ID)
-      expect(gist.gist_file[0]).to eql(TEST_GIST_FILENAME)
-      expect(gist.gist_file[1]).to be_a(Hashie::Mash)
+  describe "#file" do
+    it "returns a Gisture::File" do
+      expect(Gisture::Gist.new(TEST_GIST_ID).file).to be_a(Gisture::File)
     end
 
     context "when a gist contains a single file" do
       it "returns the file" do
-        expect(Gisture::Gist.new(TEST_GIST_ID).gist_file[0]).to eql(TEST_GIST_FILENAME)
+        expect(Gisture::Gist.new(TEST_GIST_ID).file.filename).to eql(TEST_GIST_FILENAME)
       end
     end
 
@@ -109,7 +95,7 @@ RSpec.describe Gisture::Gist do
         subject { Gisture::Gist.new(MULTI_FILE_TEST_GIST_ID, filename: MULTI_FILE_TEST_GIST_FILENAMES.sample) }
 
         it "returns the specified file" do
-          expect(subject.gist_file[0]).to eql(subject.filename)
+          expect(subject.file.filename).to eql(subject.filename)
         end
       end
 
@@ -117,20 +103,12 @@ RSpec.describe Gisture::Gist do
         subject { Gisture::Gist.new(MULTI_FILE_TEST_GIST_ID) }
 
         it "raises an ArgumentError" do
-          expect { subject.gist_file }.to raise_exception(ArgumentError)
+          expect { subject.file }.to raise_exception(ArgumentError)
         end
       end
     end
   end
 
-  describe "#raw" do
-    subject { Gisture::Gist.new(TEST_GIST_ID) }
-
-    it "returns the raw gist content" do
-      expect(subject.raw).to eql(subject.gist_file[1].content)
-    end
-  end
-
   describe "#strategy=" do
     subject { Gisture::Gist.new(TEST_GIST_ID) }
 
@@ -148,42 +126,6 @@ RSpec.describe Gisture::Gist do
     end
   end
 
-  describe "#tempfile" do
-    subject { Gisture::Gist.new(TEST_GIST_ID) }
-
-    it "creates and returns a tempfile" do
-      expect(subject.tempfile).to be_a(Tempfile)
-    end
-
-    it "uses the gist_id as the base of the filename" do
-      matched = File.basename(subject.tempfile.path).match(/#{TEST_GIST_ID}/)
-      expect(matched).to_not be_nil
-    end
-
-    it "uses the same extension as the gist's filename" do
-      expect(File.extname(subject.tempfile.path)).to eql(File.extname(subject.gist_file[0]))
-    end
-
-    it "creates the file in the configured tempdir" do
-      tmp_path = File.join(File.dirname(__FILE__), '../', 'tmp')
-      begin
-        FileUtils.mkdir_p tmp_path
-        Gisture.configure do |config|
-          config.tmpdir = tmp_path
-        end
-
-        expect(File.dirname(subject.tempfile.path)).to eql(tmp_path)
-      rescue => e
-        raise e
-      ensure
-        Gisture.configure do |config|
-          config.tmpdir = Dir.tmpdir
-        end
-        FileUtils.rm_rf tmp_path
-      end
-    end
-  end
-
   describe "#to_h" do
     subject { Gisture::Gist.new(TEST_GIST_ID, filename: "test.rb") }
 

data/spec/spec_helper.rb

@@ -9,6 +9,14 @@ Gisture.configure do |config|
   config.oauth_token = ENV['GITHUB_OAUTH_TOKEN']
 end
 
+TEST_GIST_ID = "520b474ea0248d1a0a74"
+TEST_GIST_URL = "https://gist.github.com/markrebec/520b474ea0248d1a0a74"
+TEST_GIST_VERSION = "49a9d887eeb8c723ab23deddfbbb75d4b70e8014"
+TEST_GIST_VERSION_URL = "https://gist.github.com/markrebec/520b474ea0248d1a0a74/49a9d887eeb8c723ab23deddfbbb75d4b70e8014"
+TEST_GIST_FILENAME = "test.rb"
+MULTI_FILE_TEST_GIST_ID = "0417bf78a7c2b825b4ef"
+MULTI_FILE_TEST_GIST_FILENAMES = ['file_one.rb', 'file_two.rb']
+
 RSpec.configure do |config|
   #config.before(:suite) do
   #  ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gisture
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mark Rebec
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - lib/gisture.rb
 - lib/gisture/evaluator.rb
+- lib/gisture/file.rb
 - lib/gisture/gist.rb
 - lib/gisture/github_api/client/gists.rb
 - lib/gisture/railtie.rb
@@ -86,6 +87,7 @@ files:
 - spec/gists/method.rb
 - spec/gists/simple.rb
 - spec/gisture/evaluator_spec.rb
+- spec/gisture/file_spec.rb
 - spec/gisture/gist_spec.rb
 - spec/gisture_spec.rb
 - spec/spec_helper.rb
@@ -121,6 +123,7 @@ test_files:
 - spec/gists/method.rb
 - spec/gists/simple.rb
 - spec/gisture/evaluator_spec.rb
+- spec/gisture/file_spec.rb
 - spec/gisture/gist_spec.rb
 - spec/gisture_spec.rb
 - spec/spec_helper.rb