fspath 1.1.0-darwin → 1.2.0-darwin

data/Rakefile

@@ -13,7 +13,7 @@ name = 'fspath'
     gem.license = 'MIT'
     gem.authors = ['Ivan Kuchin']
     gem.platform = platform
-    gem.add_dependency 'xattr'
+    gem.add_dependency 'ffi-xattr'
     if platform == 'darwin'
       gem.add_dependency 'rb-appscript'
     end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/fspath.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "fspath"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
   s.platform = "darwin"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Kuchin"]
-  s.date = "2011-10-31"
+  s.date = "2011-11-20"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -41,20 +41,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<xattr>, [">= 0"])
+      s.add_runtime_dependency(%q<ffi-xattr>, [">= 0"])
       s.add_runtime_dependency(%q<rb-appscript>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rake-gem-ghost>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<xattr>, [">= 0"])
+      s.add_dependency(%q<ffi-xattr>, [">= 0"])
       s.add_dependency(%q<rb-appscript>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rake-gem-ghost>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<xattr>, [">= 0"])
+    s.add_dependency(%q<ffi-xattr>, [">= 0"])
     s.add_dependency(%q<rb-appscript>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rake-gem-ghost>, [">= 0"])

data/lib/fspath/xattr.rb

@@ -1,15 +1,5 @@
 require 'fspath'
-require 'xattr'
-
-Xattr.class_eval do
-  # Accept follow_symlinks as second attribute
-  def initialize(path, follow_symlinks = true)
-    @path = path
-    @follow_symlinks = follow_symlinks
-  end
-  alias_method :[], :get
-  alias_method :[]=, :set
-end
+require 'ffi-xattr'
 
 class FSPath < Pathname
   # Xattr instance for path
@@ -19,6 +9,6 @@ class FSPath < Pathname
 
   # Xattr instance for path which doesn't follow symlinks
   def lxattr
-    Xattr.new(@path, false)
+    Xattr.new(@path, :no_follow => true)
   end
 end

data/spec/fspath/xattr_spec.rb

@@ -1,58 +1,54 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'fspath/xattr'
 
-describe Xattr do
-  describe "new" do
-    it "should accept follow_symlinks as second attribute" do
-      Xattr.new('a', true).follow_symlinks.should == true
-      Xattr.new('a', false).follow_symlinks.should == false
-    end
-
-    it "should alias get/set as []" do
-      Xattr.instance_method(:[]).should == Xattr.instance_method(:get)
-      Xattr.instance_method(:[]=).should == Xattr.instance_method(:set)
-    end
-  end
-end
-
 describe FSPath do
+  let(:path){ 'test.txt' }
+  let(:link){ 'link.txt' }
+
   before do
-    @file_path = 'with_xattr'
+    File.open(path, 'w'){ |io| io << 'some content' }
+    File.symlink(path, link)
+  end
+  after do
+    File.delete(path)
+    File.delete(link)
   end
 
   describe "xattr" do
-    before do
-      @xattr = FSPath(@file_path).xattr
-    end
+    let(:xattr){ FSPath(link).xattr }
 
     it "should return instance of Xattr" do
-      @xattr.should be_kind_of(Xattr)
+      xattr.should be_kind_of(Xattr)
     end
 
-    it "should follow_symlinks" do
-      @xattr.follow_symlinks.should be_true
+    it "should point to same path" do
+      xattr.instance_variable_get(:@path).should == link
     end
 
-    it "should point to same path" do
-      @xattr.instance_variable_get(:@path).should == @file_path
+    it "should set xattr on linked path" do
+      FSPath(path).xattr['user.hello'].should be_nil
+      xattr['user.hello'] = 'foo'
+      xattr['user.hello'].should == 'foo'
+      FSPath(path).xattr['user.hello'].should == 'foo'
     end
   end
 
   describe "lxattr" do
-    before do
-      @lxattr = FSPath(@file_path).lxattr
-    end
+    let(:xattr){ FSPath(link).lxattr }
 
     it "should return instance of Xattr" do
-      @lxattr.should be_kind_of(Xattr)
+      xattr.should be_kind_of(Xattr)
     end
 
-    it "should not follow_symlinks" do
-      @lxattr.follow_symlinks.should be_false
+    it "should point to same path" do
+      xattr.instance_variable_get(:@path).should == link
     end
 
-    it "should point to same path" do
-      @lxattr.instance_variable_get(:@path).should == @file_path
+    it "should set xattr on link itself" do
+      FSPath(path).xattr['user.hello'].should be_nil
+      xattr['user.hello'] = 'foo'
+      xattr['user.hello'].should == 'foo'
+      FSPath(path).xattr['user.hello'].should be_nil
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fspath
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: darwin
 authors: 
 - Ivan Kuchin
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-31 00:00:00 Z
+date: 2011-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: xattr
+  name: ffi-xattr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false